MapleShrine/mkxp
1
0
Fork 0
Code Issues 32 Pull requests 11 Projects Releases Wiki Activity

Rename 'GlobalState' to 'SharedState' to avoid confusion with GLState

Browse source 
This was particularly nasty with the shorthand macros
'gState' and 'glState'. The former is now 'shState'.
This commit is contained in:
Jonas Kulla 2013-10-09 12:30:33 +02:00
parent 807bee5748
commit cb6f73f7df
32 changed files with 222 additions and 222 deletions
Download patch file Download diff file Expand all files Collapse all files

18
binding-mri/input-binding.cpp
View file

@ -20,7 +20,7 @@
*/
#include "input.h"
#include "globalstate.h"
#include "sharedstate.h"
#include "exception.h"
#include "binding-util.h"
@ -28,7 +28,7 @@ RB_METHOD(inputUpdate)
{
RB_UNUSED_PARAM;
gState->input().update();
shState->input().update();
return Qnil;
}
@ -42,7 +42,7 @@ RB_METHOD(inputPress)
Input::ButtonCode bc = (Input::ButtonCode) num;
return rb_bool_new(gState->input().isPressed(bc));
return rb_bool_new(shState->input().isPressed(bc));
}
RB_METHOD(inputTrigger)
@ -54,7 +54,7 @@ RB_METHOD(inputTrigger)
Input::ButtonCode bc = (Input::ButtonCode) num;
return rb_bool_new(gState->input().isTriggered(bc));
return rb_bool_new(shState->input().isTriggered(bc));
}
RB_METHOD(inputRepeat)
@ -66,21 +66,21 @@ RB_METHOD(inputRepeat)
Input::ButtonCode bc = (Input::ButtonCode) num;
return rb_bool_new(gState->input().isRepeated(bc));
return rb_bool_new(shState->input().isRepeated(bc));
}
RB_METHOD(inputDir4)
{
RB_UNUSED_PARAM;
return rb_fix_new(gState->input().dir4Value());
return rb_fix_new(shState->input().dir4Value());
}
RB_METHOD(inputDir8)
{
RB_UNUSED_PARAM;
return rb_fix_new(gState->input().dir8Value());
return rb_fix_new(shState->input().dir8Value());
}
/* Non-standard extensions */
@ -88,14 +88,14 @@ RB_METHOD(inputMouseX)
{
RB_UNUSED_PARAM;
return rb_fix_new(gState->input().mouseX());
return rb_fix_new(shState->input().mouseX());
}
RB_METHOD(inputMouseY)
{
RB_UNUSED_PARAM;
return rb_fix_new(gState->input().mouseY());
return rb_fix_new(shState->input().mouseY());
}
#define DEF_CONST_I(name, value) \