[rbdoom3bfg] 02/07: Imported Upstream version 1.0.3+repack1+git20150806
Tobias Frost
tobi at moszumanska.debian.org
Mon Sep 14 05:47:16 UTC 2015
This is an automated email from the git hooks/post-receive script.
tobi pushed a commit to branch master
in repository rbdoom3bfg.
commit a3276cca87c1515908885f2f6bc12ce33a880710
Author: Tobias Frost <tobi at coldtobi.de>
Date: Sun Sep 13 22:15:50 2015 +0200
Imported Upstream version 1.0.3+repack1+git20150806
---
ChangeLog | 44 +++++++++++++++++++++++++++++++++++++++++
README.txt | 6 ++++++
neo/CMakeLists.txt | 4 ++++
neo/cm/CollisionModel_files.cpp | 10 +++++++++-
neo/idlib/sys/sys_intrinsics.h | 6 ------
neo/sys/posix/posix_main.cpp | 12 -----------
neo/sys/sdl/sdl_events.cpp | 30 ++++++++++++++++++++++++++++
7 files changed, 93 insertions(+), 19 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index c5c1726..2df21b9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,47 @@
+2015-08-05 Robert Beckebans <robert.beckebans at gmail.com>
+
+ * Merge pull request #240 from DanielGibson/fix-rb-crashes
+
+2015-07-27 Daniel Gibson <metalcaedes at gmail.com>
+
+ * Implemented Sys_[SG]etClipboardData() for SDL backend
+
+2015-08-01 Daniel Gibson <metalcaedes at gmail.com>
+
+ * Fix crash when running dmap on existing map
+
+2015-07-25 Robert Beckebans <robert.beckebans at gmail.com>
+
+ * Merge pull request #239 from Zi0P4tch0/archlinux-instructions
+
+2015-07-25 Matteo Pacini <ispeakprogramming at gmail.com>
+
+ * Added ArchLinux instructions
+
+2015-07-17 Robert Beckebans <robert.beckebans at gmail.com>
+
+ * Merge branch 'master' of github.com:RobertBeckebans/RBDOOM-3-BFG
+
+2015-07-17 Robert Beckebans <robert.beckebans at gmail.com>
+
+ * Updated README.txt with qconsole hint
+
+2015-07-11 Robert Beckebans <robert.beckebans at gmail.com>
+
+ * Merge branch 'master' of github.com:RobertBeckebans/RBDOOM-3-BFG
+
+2015-07-11 Robert Beckebans <robert.beckebans at gmail.com>
+
+ * Set USE_INTRINSICS for MSVC
+
+2015-07-11 Robert Beckebans <robert.beckebans at gmail.com>
+
+ * Merge pull request #234 from coldtobi/master
+
+2015-07-11 Tobias Frost <tobi at coldtobi.de>
+
+ * Do not force USE_INTRINISCS to be set via source-code
+
2015-06-24 Robert Beckebans <robert.beckebans at gmail.com>
* astyled pull requests
diff --git a/README.txt b/README.txt
index 3397941..227f49f 100644
--- a/README.txt
+++ b/README.txt
@@ -170,6 +170,10 @@ _________________________
> yum install cmake SDL-devel openal-devel
+ On ArchLinux
+
+ > sudo pacman -S sdl2 ffmpeg openal cmake
+
On openSUSE (tested in 13.1)
> zypper in openal-soft-devel cmake libSDL-devel libffmpeg1-devel
@@ -346,6 +350,8 @@ If you want to report an issue with the game, you should make sure that your rep
* If you are sending a console log, make sure to enable developer output:
RBDoom3BFG.exe +set developer 1 +set logfile 2
+
+ You can find your qconsole.log on Windows in C:\Users\<your user name>\Saved Games\id Software\RBDOOM 3 BFG\base\
NOTE: We cannot help you with OS-specific issues like configuring OpenGL correctly, configuring ALSA or configuring the network.
diff --git a/neo/CMakeLists.txt b/neo/CMakeLists.txt
index 455a6a5..7f2ae87 100644
--- a/neo/CMakeLists.txt
+++ b/neo/CMakeLists.txt
@@ -196,6 +196,10 @@ elseif(MSVC)
if( WINRT ) # Windows RT
add_definitions(-DUSE_WINRT)
endif()
+
+ if (USE_INTRINSICS)
+ add_definitions(-DUSE_INTRINSICS)
+ endif()
if(NOT CMAKE_CL_64)
add_definitions(-D_USE_32BIT_TIME_T)
diff --git a/neo/cm/CollisionModel_files.cpp b/neo/cm/CollisionModel_files.cpp
index 7fa12c2..2fac970 100644
--- a/neo/cm/CollisionModel_files.cpp
+++ b/neo/cm/CollisionModel_files.cpp
@@ -642,13 +642,21 @@ bool idCollisionModelManagerLocal::LoadCollisionModelFile( const char* name, uns
file->ReadString( fileVersion );
if( fileID == CM_FILEID && fileVersion == CM_FILEVERSION && crc == mapFileCRC && numEntries > 0 )
{
+ loaded = true; // DG: moved this up here to prevent segfaults, see below
for( int i = 0; i < numEntries; i++ )
{
cm_model_t* model = LoadBinaryModelFromFile( file, currentTimeStamp );
+ // DG: handle the case that loading the binary model fails gracefully
+ // (otherwise we'll get a segfault when someone wants to use models[numModels])
+ if( model == NULL )
+ {
+ loaded = false;
+ break;
+ }
+ // DG end
models[ numModels ] = model;
numModels++;
}
- loaded = true;
}
}
diff --git a/neo/idlib/sys/sys_intrinsics.h b/neo/idlib/sys/sys_intrinsics.h
index 975b131..eab0398 100644
--- a/neo/idlib/sys/sys_intrinsics.h
+++ b/neo/idlib/sys/sys_intrinsics.h
@@ -29,12 +29,6 @@ If you have questions concerning this license or the applicable additional terms
#ifndef __SYS_INTRIINSICS_H__
#define __SYS_INTRIINSICS_H__
-#if !defined(USE_INTRINSICS)
-#if defined(WIN32) || defined(__i386__) || defined(__x86_64__)
-#define USE_INTRINSICS
-#endif
-#endif
-
#if defined(USE_INTRINSICS)
#include <emmintrin.h>
#endif
diff --git a/neo/sys/posix/posix_main.cpp b/neo/sys/posix/posix_main.cpp
index 7869939..2cad9df 100644
--- a/neo/sys/posix/posix_main.cpp
+++ b/neo/sys/posix/posix_main.cpp
@@ -835,18 +835,6 @@ void Sys_Sleep( int msec )
#endif
}
-char* Sys_GetClipboardData()
-{
- Sys_Printf( "TODO: Sys_GetClipboardData\n" );
- return NULL;
-}
-
-void Sys_SetClipboardData( const char* string )
-{
- Sys_Printf( "TODO: Sys_SetClipboardData\n" );
-}
-
-
// stub pretty much everywhere - heavy calling
void Sys_FlushCacheMemory( void* base, int bytes )
{
diff --git a/neo/sys/sdl/sdl_events.cpp b/neo/sys/sdl/sdl_events.cpp
index 9ce8712..b2bcda2 100644
--- a/neo/sys/sdl/sdl_events.cpp
+++ b/neo/sys/sdl/sdl_events.cpp
@@ -1731,6 +1731,36 @@ const char* Sys_GetKeyName( keyNum_t keynum )
return NULL;
}
+char* Sys_GetClipboardData()
+{
+#if SDL_VERSION_ATLEAST(2, 0, 0)
+ char* txt = SDL_GetClipboardText();
+
+ if( txt == NULL )
+ {
+ return NULL;
+ }
+ else if( txt[0] == '\0' )
+ {
+ SDL_free( txt );
+ return NULL;
+ }
+
+ char* ret = Mem_CopyString( txt );
+ SDL_free( txt );
+ return ret;
+#else
+ return NULL; // SDL1.2 doesn't support clipboard
+#endif
+}
+
+void Sys_SetClipboardData( const char* string )
+{
+#if SDL_VERSION_ATLEAST(2, 0, 0)
+ SDL_SetClipboardText( string );
+#endif
+}
+
//=====================================================================================
// Joystick Input Handling
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/rbdoom3bfg.git
More information about the Pkg-games-commits
mailing list