MapleShrine/mkxp
1
0
Fork 0
Code Issues32 Pull requests11 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
binding-mruby
input-binding.cpp

18
binding-mruby/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 @@ MRB_FUNCTION(inputUpdate)
{
MRB_FUN_UNUSED_PARAM;
gState->input().update();
shState->input().update();
return mrb_nil_value();
}
@ -40,7 +40,7 @@ MRB_FUNCTION(inputPress)
Input::ButtonCode bc = (Input::ButtonCode) num;
return mrb_bool_value(gState->input().isPressed(bc));
return mrb_bool_value(shState->input().isPressed(bc));
}
MRB_FUNCTION(inputTrigger)
@ -50,7 +50,7 @@ MRB_FUNCTION(inputTrigger)
Input::ButtonCode bc = (Input::ButtonCode) num;
return mrb_bool_value(gState->input().isTriggered(bc));
return mrb_bool_value(shState->input().isTriggered(bc));
}
MRB_FUNCTION(inputRepeat)
@ -60,21 +60,21 @@ MRB_FUNCTION(inputRepeat)
Input::ButtonCode bc = (Input::ButtonCode) num;
return mrb_bool_value(gState->input().isRepeated(bc));
return mrb_bool_value(shState->input().isRepeated(bc));
}
MRB_FUNCTION(inputDir4)
{
MRB_FUN_UNUSED_PARAM;
return mrb_fixnum_value(gState->input().dir4Value());
return mrb_fixnum_value(shState->input().dir4Value());
}
MRB_FUNCTION(inputDir8)
{
MRB_FUN_UNUSED_PARAM;
return mrb_fixnum_value(gState->input().dir8Value());
return mrb_fixnum_value(shState->input().dir8Value());
}
/* Non-standard extensions */
@ -82,14 +82,14 @@ MRB_FUNCTION(inputMouseX)
{
MRB_FUN_UNUSED_PARAM;
return mrb_fixnum_value(gState->input().mouseX());
return mrb_fixnum_value(shState->input().mouseX());
}
MRB_FUNCTION(inputMouseY)
{
MRB_FUN_UNUSED_PARAM;
return mrb_fixnum_value(gState->input().mouseY());
return mrb_fixnum_value(shState->input().mouseY());
}
#define DEF_CONST_I(name, value) \