q3aql/Serious-Engine
q3aql/Serious-Engine
1
0
Fork 0
mirror of https://github.com/ptitSeb/Serious-Engine synced 2024-11-26 04:05:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

Better #if condition, and add a warning to be better checked latter

Browse Source
This commit is contained in:
ptitSeb 2016-04-13 08:21:50 +02:00
parent 9678ec3e58
commit cd2a586a9e
4 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Sources/Engine/Base/Lists.cpp Normal file → Executable file
View File

@ -234,8 +234,7 @@ void CListNode::Remove(void)
ASSERT(next.IsTailMarker() || next.IsLinked()); ASSERT(next.IsTailMarker() || next.IsLinked());
ASSERT(prev.IsHeadMarker() || prev.IsLinked()); ASSERT(prev.IsHeadMarker() || prev.IsLinked());
if(ln_Succ) next.ln_Pred = &prev;
next.ln_Pred = &prev;
prev.ln_Succ = &next; prev.ln_Succ = &next;
// make a non-linked node // make a non-linked node
ln_Succ = NULL; ln_Succ = NULL;

6
Sources/Engine/Base/SDL/SDLInput.cpp
View File

@ -675,11 +675,16 @@ void CInput::DisableInput( void)
inp_bPollJoysticks = FALSE; inp_bPollJoysticks = FALSE;
} }
#define USE_MOUSEWARP 1
// Define this to use GetMouse instead of using Message to read mouse coordinates
// blank any queued mousemove events...SDLInput.cpp needs this when // blank any queued mousemove events...SDLInput.cpp needs this when
// returning from the menus/console to game or the viewport will jump... // returning from the menus/console to game or the viewport will jump...
void CInput::ClearRelativeMouseMotion(void) void CInput::ClearRelativeMouseMotion(void)
{ {
#if USE_MOUSEWARP
SDL_GetRelativeMouseState(NULL, NULL);
#endif
mouse_relative_x = mouse_relative_y = 0; mouse_relative_x = mouse_relative_y = 0;
} }
@ -744,7 +749,6 @@ void CInput::GetInput(BOOL bPreScan)
_abKeysPressed[KID_MOUSEWHEELDOWN] = FALSE; _abKeysPressed[KID_MOUSEWHEELDOWN] = FALSE;
// read mouse position // read mouse position
//#define USE_MOUSEWARP 1
#ifdef USE_MOUSEWARP #ifdef USE_MOUSEWARP
int iMx, iMy; int iMx, iMy;
SDL_GetRelativeMouseState(&iMx, &iMy); SDL_GetRelativeMouseState(&iMx, &iMy);

2
Sources/Engine/Base/Stream.cpp Normal file → Executable file
View File

@ -12,7 +12,7 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License along You should have received a copy of the GNU General Public License along
with this program; if not, write to the Free Software Foundation, Inc., with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */
#pragma GCC optimize 0
#include "Engine/StdH.h" #include "Engine/StdH.h"
#include <sys/types.h> #include <sys/types.h>

2
Sources/GameMP/Game.cpp
View File

@ -2226,6 +2226,8 @@ void CGame::GameRedrawView( CDrawPort *pdpDrawPort, ULONG ulFlags)
// timer must not occur during prescanning // timer must not occur during prescanning
{ {
#if defined(PLATFORM_UNIX) && !defined(SINGLE_THREADED) #if defined(PLATFORM_UNIX) && !defined(SINGLE_THREADED)
#warning "This seems to cause Race Condition, so disabled"
#else
CTSingleLock csTimer(&_pTimer->tm_csHooks, TRUE); CTSingleLock csTimer(&_pTimer->tm_csHooks, TRUE);
#endif #endif
// for each local player // for each local player