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

Graphics: Fix ::transition() "filename" default value 

The default value is an empty string, which triggers the simple
transition. Passing null is not legal (and wasn't possible in
mkxp from Ruby side anyway).

Fixes #108.
This commit is contained in:
Jonas Kulla 2015-06-10 13:23:39 +02:00
parent 064b7ac80d
commit 6380a93cec
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
binding-mri/graphics-binding.cpp
View File

@ -48,7 +48,7 @@ RB_METHOD(graphicsTransition)
RB_UNUSED_PARAM; RB_UNUSED_PARAM;
int duration = 8; int duration = 8;
const char *filename = 0; const char *filename = "";
int vague = 40; int vague = 40;
rb_get_args(argc, argv, "|izi", &duration, &filename, &vague RB_ARG_END); rb_get_args(argc, argv, "|izi", &duration, &filename, &vague RB_ARG_END);

2
binding-mruby/graphics-binding.cpp
View File

@ -45,7 +45,7 @@ MRB_FUNCTION(graphicsFreeze)
MRB_FUNCTION(graphicsTransition) MRB_FUNCTION(graphicsTransition)
{ {
mrb_int duration = 8; mrb_int duration = 8;
const char *filename = 0; const char *filename = "";
mrb_int vague = 40; mrb_int vague = 40;
mrb_get_args(mrb, "|izi", &duration, &filename, &vague); mrb_get_args(mrb, "|izi", &duration, &filename, &vague);

2
src/graphics.cpp
View File

@ -716,7 +716,7 @@ void Graphics::transition(int duration,
return; return;
vague = clamp(vague, 1, 256); vague = clamp(vague, 1, 256);
Bitmap *transMap = filename ? new Bitmap(filename) : 0; Bitmap *transMap = *filename ? new Bitmap(filename) : 0;
setBrightness(255); setBrightness(255);

2
src/graphics.h
View File

@ -37,7 +37,7 @@ public:
void update(); void update();
void freeze(); void freeze();
void transition(int duration = 8, void transition(int duration = 8,
const char *filename = 0, const char *filename = "",
int vague = 40); int vague = 40);
void frameReset(); void frameReset();