mirror of
https://github.com/ptitSeb/Serious-Engine
synced 2024-11-25 19:55:54 +01:00
Better #if condition, and add a warning to be better checked latter
This commit is contained in:
parent
9678ec3e58
commit
cd2a586a9e
3
Sources/Engine/Base/Lists.cpp
Normal file → Executable file
3
Sources/Engine/Base/Lists.cpp
Normal file → Executable file
|
@ -234,8 +234,7 @@ void CListNode::Remove(void)
|
|||
ASSERT(next.IsTailMarker() || next.IsLinked());
|
||||
ASSERT(prev.IsHeadMarker() || prev.IsLinked());
|
||||
|
||||
if(ln_Succ)
|
||||
next.ln_Pred = &prev;
|
||||
next.ln_Pred = &prev;
|
||||
prev.ln_Succ = &next;
|
||||
// make a non-linked node
|
||||
ln_Succ = NULL;
|
||||
|
|
|
@ -675,11 +675,16 @@ void CInput::DisableInput( void)
|
|||
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
|
||||
// returning from the menus/console to game or the viewport will jump...
|
||||
void CInput::ClearRelativeMouseMotion(void)
|
||||
{
|
||||
#if USE_MOUSEWARP
|
||||
SDL_GetRelativeMouseState(NULL, NULL);
|
||||
#endif
|
||||
mouse_relative_x = mouse_relative_y = 0;
|
||||
}
|
||||
|
||||
|
@ -744,7 +749,6 @@ void CInput::GetInput(BOOL bPreScan)
|
|||
_abKeysPressed[KID_MOUSEWHEELDOWN] = FALSE;
|
||||
|
||||
// read mouse position
|
||||
//#define USE_MOUSEWARP 1
|
||||
#ifdef USE_MOUSEWARP
|
||||
int iMx, iMy;
|
||||
SDL_GetRelativeMouseState(&iMx, &iMy);
|
||||
|
|
2
Sources/Engine/Base/Stream.cpp
Normal file → Executable file
2
Sources/Engine/Base/Stream.cpp
Normal file → Executable 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
|
||||
with this program; if not, write to the Free Software Foundation, Inc.,
|
||||
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */
|
||||
#pragma GCC optimize 0
|
||||
|
||||
#include "Engine/StdH.h"
|
||||
|
||||
#include <sys/types.h>
|
||||
|
|
|
@ -2226,6 +2226,8 @@ void CGame::GameRedrawView( CDrawPort *pdpDrawPort, ULONG ulFlags)
|
|||
// timer must not occur during prescanning
|
||||
{
|
||||
#if defined(PLATFORM_UNIX) && !defined(SINGLE_THREADED)
|
||||
#warning "This seems to cause Race Condition, so disabled"
|
||||
#else
|
||||
CTSingleLock csTimer(&_pTimer->tm_csHooks, TRUE);
|
||||
#endif
|
||||
// for each local player
|
||||
|
|
Loading…
Reference in New Issue
Block a user