X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fscripting%2Fwrapper.cpp;h=512c55c1049887bf7272c32137779305d2784a38;hb=8f82a8e619346be81a3c1bf943baf68953f1f4e7;hp=bcd4406087f80e964e00efdd7a781ccb65e2b505;hpb=5069d8fa90db33fd5f68540eda111f1fcf5f2d25;p=supertux.git diff --git a/src/scripting/wrapper.cpp b/src/scripting/wrapper.cpp index bcd440608..512c55c10 100644 --- a/src/scripting/wrapper.cpp +++ b/src/scripting/wrapper.cpp @@ -12,8 +12,36 @@ #include "wrapper_util.hpp" #include "wrapper.interface.hpp" -using namespace Scripting; +namespace SquirrelWrapper +{ + +static int DisplayEffect_release_hook(SQUserPointer ptr, int ) +{ + Scripting::DisplayEffect* _this = reinterpret_cast (ptr); + delete _this; + return 0; +} +void create_squirrel_instance(HSQUIRRELVM v, Scripting::DisplayEffect* object, bool setup_releasehook) +{ + sq_pushstring(v, "DisplayEffect", -1); + if(sq_get(v, -2) < 0) { + std::ostringstream msg; + msg << "Couldn't resolved squirrel type 'DisplayEffect'"; + throw SquirrelError(v, msg.str()); + } + + if(sq_createinstance(v, -1) < 0 || sq_setinstanceup(v, -1, object) < 0) { + std::ostringstream msg; + msg << "Couldn't setup squirrel instance for object of type 'DisplayEffect'"; + throw SquirrelError(v, msg.str()); + } + sq_remove(v, -2); + + if(setup_releasehook) { + sq_setreleasehook(v, -1, DisplayEffect_release_hook); + } +} static int DisplayEffect_fade_out_wrapper(HSQUIRRELVM v) { Scripting::DisplayEffect* _this; @@ -61,6 +89,33 @@ static int DisplayEffect_is_black_wrapper(HSQUIRRELVM v) return 1; } +static int Camera_release_hook(SQUserPointer ptr, int ) +{ + Scripting::Camera* _this = reinterpret_cast (ptr); + delete _this; + return 0; +} + +void create_squirrel_instance(HSQUIRRELVM v, Scripting::Camera* object, bool setup_releasehook) +{ + sq_pushstring(v, "Camera", -1); + if(sq_get(v, -2) < 0) { + std::ostringstream msg; + msg << "Couldn't resolved squirrel type 'Camera'"; + throw SquirrelError(v, msg.str()); + } + + if(sq_createinstance(v, -1) < 0 || sq_setinstanceup(v, -1, object) < 0) { + std::ostringstream msg; + msg << "Couldn't setup squirrel instance for object of type 'Camera'"; + throw SquirrelError(v, msg.str()); + } + sq_remove(v, -2); + + if(setup_releasehook) { + sq_setreleasehook(v, -1, Camera_release_hook); + } +} static int Camera_shake_wrapper(HSQUIRRELVM v) { Scripting::Camera* _this; @@ -103,6 +158,33 @@ static int Camera_set_mode_wrapper(HSQUIRRELVM v) return 0; } +static int Level_release_hook(SQUserPointer ptr, int ) +{ + Scripting::Level* _this = reinterpret_cast (ptr); + delete _this; + return 0; +} + +void create_squirrel_instance(HSQUIRRELVM v, Scripting::Level* object, bool setup_releasehook) +{ + sq_pushstring(v, "Level", -1); + if(sq_get(v, -2) < 0) { + std::ostringstream msg; + msg << "Couldn't resolved squirrel type 'Level'"; + throw SquirrelError(v, msg.str()); + } + + if(sq_createinstance(v, -1) < 0 || sq_setinstanceup(v, -1, object) < 0) { + std::ostringstream msg; + msg << "Couldn't setup squirrel instance for object of type 'Level'"; + throw SquirrelError(v, msg.str()); + } + sq_remove(v, -2); + + if(setup_releasehook) { + sq_setreleasehook(v, -1, Level_release_hook); + } +} static int Level_finish_wrapper(HSQUIRRELVM v) { Scripting::Level* _this; @@ -137,6 +219,33 @@ static int Level_flip_vertically_wrapper(HSQUIRRELVM v) return 0; } +static int ScriptedObject_release_hook(SQUserPointer ptr, int ) +{ + Scripting::ScriptedObject* _this = reinterpret_cast (ptr); + delete _this; + return 0; +} + +void create_squirrel_instance(HSQUIRRELVM v, Scripting::ScriptedObject* object, bool setup_releasehook) +{ + sq_pushstring(v, "ScriptedObject", -1); + if(sq_get(v, -2) < 0) { + std::ostringstream msg; + msg << "Couldn't resolved squirrel type 'ScriptedObject'"; + throw SquirrelError(v, msg.str()); + } + + if(sq_createinstance(v, -1) < 0 || sq_setinstanceup(v, -1, object) < 0) { + std::ostringstream msg; + msg << "Couldn't setup squirrel instance for object of type 'ScriptedObject'"; + throw SquirrelError(v, msg.str()); + } + sq_remove(v, -2); + + if(setup_releasehook) { + sq_setreleasehook(v, -1, ScriptedObject_release_hook); + } +} static int ScriptedObject_set_animation_wrapper(HSQUIRRELVM v) { Scripting::ScriptedObject* _this; @@ -280,6 +389,33 @@ static int ScriptedObject_get_name_wrapper(HSQUIRRELVM v) return 1; } +static int Sound_release_hook(SQUserPointer ptr, int ) +{ + Scripting::Sound* _this = reinterpret_cast (ptr); + delete _this; + return 0; +} + +void create_squirrel_instance(HSQUIRRELVM v, Scripting::Sound* object, bool setup_releasehook) +{ + sq_pushstring(v, "Sound", -1); + if(sq_get(v, -2) < 0) { + std::ostringstream msg; + msg << "Couldn't resolved squirrel type 'Sound'"; + throw SquirrelError(v, msg.str()); + } + + if(sq_createinstance(v, -1) < 0 || sq_setinstanceup(v, -1, object) < 0) { + std::ostringstream msg; + msg << "Couldn't setup squirrel instance for object of type 'Sound'"; + throw SquirrelError(v, msg.str()); + } + sq_remove(v, -2); + + if(setup_releasehook) { + sq_setreleasehook(v, -1, Sound_release_hook); + } +} static int Sound_play_music_wrapper(HSQUIRRELVM v) { Scripting::Sound* _this; @@ -304,6 +440,33 @@ static int Sound_play_wrapper(HSQUIRRELVM v) return 0; } +static int Text_release_hook(SQUserPointer ptr, int ) +{ + Scripting::Text* _this = reinterpret_cast (ptr); + delete _this; + return 0; +} + +void create_squirrel_instance(HSQUIRRELVM v, Scripting::Text* object, bool setup_releasehook) +{ + sq_pushstring(v, "Text", -1); + if(sq_get(v, -2) < 0) { + std::ostringstream msg; + msg << "Couldn't resolved squirrel type 'Text'"; + throw SquirrelError(v, msg.str()); + } + + if(sq_createinstance(v, -1) < 0 || sq_setinstanceup(v, -1, object) < 0) { + std::ostringstream msg; + msg << "Couldn't setup squirrel instance for object of type 'Text'"; + throw SquirrelError(v, msg.str()); + } + sq_remove(v, -2); + + if(setup_releasehook) { + sq_setreleasehook(v, -1, Text_release_hook); + } +} static int Text_set_text_wrapper(HSQUIRRELVM v) { Scripting::Text* _this; @@ -364,6 +527,33 @@ static int Text_set_visible_wrapper(HSQUIRRELVM v) return 0; } +static int Player_release_hook(SQUserPointer ptr, int ) +{ + Scripting::Player* _this = reinterpret_cast (ptr); + delete _this; + return 0; +} + +void create_squirrel_instance(HSQUIRRELVM v, Scripting::Player* object, bool setup_releasehook) +{ + sq_pushstring(v, "Player", -1); + if(sq_get(v, -2) < 0) { + std::ostringstream msg; + msg << "Couldn't resolved squirrel type 'Player'"; + throw SquirrelError(v, msg.str()); + } + + if(sq_createinstance(v, -1) < 0 || sq_setinstanceup(v, -1, object) < 0) { + std::ostringstream msg; + msg << "Couldn't setup squirrel instance for object of type 'Player'"; + throw SquirrelError(v, msg.str()); + } + sq_remove(v, -2); + + if(setup_releasehook) { + sq_setreleasehook(v, -1, Player_release_hook); + } +} static int Player_set_bonus_wrapper(HSQUIRRELVM v) { Scripting::Player* _this; @@ -456,7 +646,7 @@ void register_supertux_wrapper(HSQUIRRELVM v) sq_pushstring(v, "display_text_file", -1); sq_newclosure(v, &display_text_file_wrapper, 0); if(sq_createslot(v, -3) < 0) { - std::stringstream msg; + std::ostringstream msg; msg << "Couldn't register function'display_text_file'"; throw SquirrelError(v, msg.str()); } @@ -464,7 +654,7 @@ void register_supertux_wrapper(HSQUIRRELVM v) sq_pushstring(v, "wait", -1); sq_newclosure(v, &wait_wrapper, 0); if(sq_createslot(v, -3) < 0) { - std::stringstream msg; + std::ostringstream msg; msg << "Couldn't register function'wait'"; throw SquirrelError(v, msg.str()); } @@ -472,7 +662,7 @@ void register_supertux_wrapper(HSQUIRRELVM v) sq_pushstring(v, "translate", -1); sq_newclosure(v, &translate_wrapper, 0); if(sq_createslot(v, -3) < 0) { - std::stringstream msg; + std::ostringstream msg; msg << "Couldn't register function'translate'"; throw SquirrelError(v, msg.str()); } @@ -480,7 +670,7 @@ void register_supertux_wrapper(HSQUIRRELVM v) sq_pushstring(v, "import", -1); sq_newclosure(v, &import_wrapper, 0); if(sq_createslot(v, -3) < 0) { - std::stringstream msg; + std::ostringstream msg; msg << "Couldn't register function'import'"; throw SquirrelError(v, msg.str()); } @@ -488,14 +678,14 @@ void register_supertux_wrapper(HSQUIRRELVM v) // Register class DisplayEffect sq_pushstring(v, "DisplayEffect", -1); if(sq_newclass(v, SQFalse) < 0) { - std::stringstream msg; + std::ostringstream msg; msg << "Couldn't create new class 'DisplayEffect'"; throw SquirrelError(v, msg.str()); } sq_pushstring(v, "fade_out", -1); sq_newclosure(v, &DisplayEffect_fade_out_wrapper, 0); if(sq_createslot(v, -3) < 0) { - std::stringstream msg; + std::ostringstream msg; msg << "Couldn't register function'fade_out'"; throw SquirrelError(v, msg.str()); } @@ -503,7 +693,7 @@ void register_supertux_wrapper(HSQUIRRELVM v) sq_pushstring(v, "fade_in", -1); sq_newclosure(v, &DisplayEffect_fade_in_wrapper, 0); if(sq_createslot(v, -3) < 0) { - std::stringstream msg; + std::ostringstream msg; msg << "Couldn't register function'fade_in'"; throw SquirrelError(v, msg.str()); } @@ -511,7 +701,7 @@ void register_supertux_wrapper(HSQUIRRELVM v) sq_pushstring(v, "set_black", -1); sq_newclosure(v, &DisplayEffect_set_black_wrapper, 0); if(sq_createslot(v, -3) < 0) { - std::stringstream msg; + std::ostringstream msg; msg << "Couldn't register function'set_black'"; throw SquirrelError(v, msg.str()); } @@ -519,13 +709,13 @@ void register_supertux_wrapper(HSQUIRRELVM v) sq_pushstring(v, "is_black", -1); sq_newclosure(v, &DisplayEffect_is_black_wrapper, 0); if(sq_createslot(v, -3) < 0) { - std::stringstream msg; + std::ostringstream msg; msg << "Couldn't register function'is_black'"; throw SquirrelError(v, msg.str()); } if(sq_createslot(v, -3) < 0) { - std::stringstream msg; + std::ostringstream msg; msg << "Couldn't register class'DisplayEffect'"; throw SquirrelError(v, msg.str()); } @@ -533,14 +723,14 @@ void register_supertux_wrapper(HSQUIRRELVM v) // Register class Camera sq_pushstring(v, "Camera", -1); if(sq_newclass(v, SQFalse) < 0) { - std::stringstream msg; + std::ostringstream msg; msg << "Couldn't create new class 'Camera'"; throw SquirrelError(v, msg.str()); } sq_pushstring(v, "shake", -1); sq_newclosure(v, &Camera_shake_wrapper, 0); if(sq_createslot(v, -3) < 0) { - std::stringstream msg; + std::ostringstream msg; msg << "Couldn't register function'shake'"; throw SquirrelError(v, msg.str()); } @@ -548,7 +738,7 @@ void register_supertux_wrapper(HSQUIRRELVM v) sq_pushstring(v, "set_pos", -1); sq_newclosure(v, &Camera_set_pos_wrapper, 0); if(sq_createslot(v, -3) < 0) { - std::stringstream msg; + std::ostringstream msg; msg << "Couldn't register function'set_pos'"; throw SquirrelError(v, msg.str()); } @@ -556,13 +746,13 @@ void register_supertux_wrapper(HSQUIRRELVM v) sq_pushstring(v, "set_mode", -1); sq_newclosure(v, &Camera_set_mode_wrapper, 0); if(sq_createslot(v, -3) < 0) { - std::stringstream msg; + std::ostringstream msg; msg << "Couldn't register function'set_mode'"; throw SquirrelError(v, msg.str()); } if(sq_createslot(v, -3) < 0) { - std::stringstream msg; + std::ostringstream msg; msg << "Couldn't register class'Camera'"; throw SquirrelError(v, msg.str()); } @@ -570,14 +760,14 @@ void register_supertux_wrapper(HSQUIRRELVM v) // Register class Level sq_pushstring(v, "Level", -1); if(sq_newclass(v, SQFalse) < 0) { - std::stringstream msg; + std::ostringstream msg; msg << "Couldn't create new class 'Level'"; throw SquirrelError(v, msg.str()); } sq_pushstring(v, "finish", -1); sq_newclosure(v, &Level_finish_wrapper, 0); if(sq_createslot(v, -3) < 0) { - std::stringstream msg; + std::ostringstream msg; msg << "Couldn't register function'finish'"; throw SquirrelError(v, msg.str()); } @@ -585,7 +775,7 @@ void register_supertux_wrapper(HSQUIRRELVM v) sq_pushstring(v, "spawn", -1); sq_newclosure(v, &Level_spawn_wrapper, 0); if(sq_createslot(v, -3) < 0) { - std::stringstream msg; + std::ostringstream msg; msg << "Couldn't register function'spawn'"; throw SquirrelError(v, msg.str()); } @@ -593,13 +783,13 @@ void register_supertux_wrapper(HSQUIRRELVM v) sq_pushstring(v, "flip_vertically", -1); sq_newclosure(v, &Level_flip_vertically_wrapper, 0); if(sq_createslot(v, -3) < 0) { - std::stringstream msg; + std::ostringstream msg; msg << "Couldn't register function'flip_vertically'"; throw SquirrelError(v, msg.str()); } if(sq_createslot(v, -3) < 0) { - std::stringstream msg; + std::ostringstream msg; msg << "Couldn't register class'Level'"; throw SquirrelError(v, msg.str()); } @@ -607,14 +797,14 @@ void register_supertux_wrapper(HSQUIRRELVM v) // Register class ScriptedObject sq_pushstring(v, "ScriptedObject", -1); if(sq_newclass(v, SQFalse) < 0) { - std::stringstream msg; + std::ostringstream msg; msg << "Couldn't create new class 'ScriptedObject'"; throw SquirrelError(v, msg.str()); } sq_pushstring(v, "set_animation", -1); sq_newclosure(v, &ScriptedObject_set_animation_wrapper, 0); if(sq_createslot(v, -3) < 0) { - std::stringstream msg; + std::ostringstream msg; msg << "Couldn't register function'set_animation'"; throw SquirrelError(v, msg.str()); } @@ -622,7 +812,7 @@ void register_supertux_wrapper(HSQUIRRELVM v) sq_pushstring(v, "get_animation", -1); sq_newclosure(v, &ScriptedObject_get_animation_wrapper, 0); if(sq_createslot(v, -3) < 0) { - std::stringstream msg; + std::ostringstream msg; msg << "Couldn't register function'get_animation'"; throw SquirrelError(v, msg.str()); } @@ -630,7 +820,7 @@ void register_supertux_wrapper(HSQUIRRELVM v) sq_pushstring(v, "move", -1); sq_newclosure(v, &ScriptedObject_move_wrapper, 0); if(sq_createslot(v, -3) < 0) { - std::stringstream msg; + std::ostringstream msg; msg << "Couldn't register function'move'"; throw SquirrelError(v, msg.str()); } @@ -638,7 +828,7 @@ void register_supertux_wrapper(HSQUIRRELVM v) sq_pushstring(v, "set_pos", -1); sq_newclosure(v, &ScriptedObject_set_pos_wrapper, 0); if(sq_createslot(v, -3) < 0) { - std::stringstream msg; + std::ostringstream msg; msg << "Couldn't register function'set_pos'"; throw SquirrelError(v, msg.str()); } @@ -646,7 +836,7 @@ void register_supertux_wrapper(HSQUIRRELVM v) sq_pushstring(v, "get_pos_x", -1); sq_newclosure(v, &ScriptedObject_get_pos_x_wrapper, 0); if(sq_createslot(v, -3) < 0) { - std::stringstream msg; + std::ostringstream msg; msg << "Couldn't register function'get_pos_x'"; throw SquirrelError(v, msg.str()); } @@ -654,7 +844,7 @@ void register_supertux_wrapper(HSQUIRRELVM v) sq_pushstring(v, "get_pos_y", -1); sq_newclosure(v, &ScriptedObject_get_pos_y_wrapper, 0); if(sq_createslot(v, -3) < 0) { - std::stringstream msg; + std::ostringstream msg; msg << "Couldn't register function'get_pos_y'"; throw SquirrelError(v, msg.str()); } @@ -662,7 +852,7 @@ void register_supertux_wrapper(HSQUIRRELVM v) sq_pushstring(v, "set_velocity", -1); sq_newclosure(v, &ScriptedObject_set_velocity_wrapper, 0); if(sq_createslot(v, -3) < 0) { - std::stringstream msg; + std::ostringstream msg; msg << "Couldn't register function'set_velocity'"; throw SquirrelError(v, msg.str()); } @@ -670,7 +860,7 @@ void register_supertux_wrapper(HSQUIRRELVM v) sq_pushstring(v, "get_velocity_x", -1); sq_newclosure(v, &ScriptedObject_get_velocity_x_wrapper, 0); if(sq_createslot(v, -3) < 0) { - std::stringstream msg; + std::ostringstream msg; msg << "Couldn't register function'get_velocity_x'"; throw SquirrelError(v, msg.str()); } @@ -678,7 +868,7 @@ void register_supertux_wrapper(HSQUIRRELVM v) sq_pushstring(v, "get_velocity_y", -1); sq_newclosure(v, &ScriptedObject_get_velocity_y_wrapper, 0); if(sq_createslot(v, -3) < 0) { - std::stringstream msg; + std::ostringstream msg; msg << "Couldn't register function'get_velocity_y'"; throw SquirrelError(v, msg.str()); } @@ -686,7 +876,7 @@ void register_supertux_wrapper(HSQUIRRELVM v) sq_pushstring(v, "set_visible", -1); sq_newclosure(v, &ScriptedObject_set_visible_wrapper, 0); if(sq_createslot(v, -3) < 0) { - std::stringstream msg; + std::ostringstream msg; msg << "Couldn't register function'set_visible'"; throw SquirrelError(v, msg.str()); } @@ -694,7 +884,7 @@ void register_supertux_wrapper(HSQUIRRELVM v) sq_pushstring(v, "is_visible", -1); sq_newclosure(v, &ScriptedObject_is_visible_wrapper, 0); if(sq_createslot(v, -3) < 0) { - std::stringstream msg; + std::ostringstream msg; msg << "Couldn't register function'is_visible'"; throw SquirrelError(v, msg.str()); } @@ -702,13 +892,13 @@ void register_supertux_wrapper(HSQUIRRELVM v) sq_pushstring(v, "get_name", -1); sq_newclosure(v, &ScriptedObject_get_name_wrapper, 0); if(sq_createslot(v, -3) < 0) { - std::stringstream msg; + std::ostringstream msg; msg << "Couldn't register function'get_name'"; throw SquirrelError(v, msg.str()); } if(sq_createslot(v, -3) < 0) { - std::stringstream msg; + std::ostringstream msg; msg << "Couldn't register class'ScriptedObject'"; throw SquirrelError(v, msg.str()); } @@ -716,14 +906,14 @@ void register_supertux_wrapper(HSQUIRRELVM v) // Register class Sound sq_pushstring(v, "Sound", -1); if(sq_newclass(v, SQFalse) < 0) { - std::stringstream msg; + std::ostringstream msg; msg << "Couldn't create new class 'Sound'"; throw SquirrelError(v, msg.str()); } sq_pushstring(v, "play_music", -1); sq_newclosure(v, &Sound_play_music_wrapper, 0); if(sq_createslot(v, -3) < 0) { - std::stringstream msg; + std::ostringstream msg; msg << "Couldn't register function'play_music'"; throw SquirrelError(v, msg.str()); } @@ -731,13 +921,13 @@ void register_supertux_wrapper(HSQUIRRELVM v) sq_pushstring(v, "play", -1); sq_newclosure(v, &Sound_play_wrapper, 0); if(sq_createslot(v, -3) < 0) { - std::stringstream msg; + std::ostringstream msg; msg << "Couldn't register function'play'"; throw SquirrelError(v, msg.str()); } if(sq_createslot(v, -3) < 0) { - std::stringstream msg; + std::ostringstream msg; msg << "Couldn't register class'Sound'"; throw SquirrelError(v, msg.str()); } @@ -745,14 +935,14 @@ void register_supertux_wrapper(HSQUIRRELVM v) // Register class Text sq_pushstring(v, "Text", -1); if(sq_newclass(v, SQFalse) < 0) { - std::stringstream msg; + std::ostringstream msg; msg << "Couldn't create new class 'Text'"; throw SquirrelError(v, msg.str()); } sq_pushstring(v, "set_text", -1); sq_newclosure(v, &Text_set_text_wrapper, 0); if(sq_createslot(v, -3) < 0) { - std::stringstream msg; + std::ostringstream msg; msg << "Couldn't register function'set_text'"; throw SquirrelError(v, msg.str()); } @@ -760,7 +950,7 @@ void register_supertux_wrapper(HSQUIRRELVM v) sq_pushstring(v, "set_font", -1); sq_newclosure(v, &Text_set_font_wrapper, 0); if(sq_createslot(v, -3) < 0) { - std::stringstream msg; + std::ostringstream msg; msg << "Couldn't register function'set_font'"; throw SquirrelError(v, msg.str()); } @@ -768,7 +958,7 @@ void register_supertux_wrapper(HSQUIRRELVM v) sq_pushstring(v, "fade_in", -1); sq_newclosure(v, &Text_fade_in_wrapper, 0); if(sq_createslot(v, -3) < 0) { - std::stringstream msg; + std::ostringstream msg; msg << "Couldn't register function'fade_in'"; throw SquirrelError(v, msg.str()); } @@ -776,7 +966,7 @@ void register_supertux_wrapper(HSQUIRRELVM v) sq_pushstring(v, "fade_out", -1); sq_newclosure(v, &Text_fade_out_wrapper, 0); if(sq_createslot(v, -3) < 0) { - std::stringstream msg; + std::ostringstream msg; msg << "Couldn't register function'fade_out'"; throw SquirrelError(v, msg.str()); } @@ -784,56 +974,28 @@ void register_supertux_wrapper(HSQUIRRELVM v) sq_pushstring(v, "set_visible", -1); sq_newclosure(v, &Text_set_visible_wrapper, 0); if(sq_createslot(v, -3) < 0) { - std::stringstream msg; + std::ostringstream msg; msg << "Couldn't register function'set_visible'"; throw SquirrelError(v, msg.str()); } if(sq_createslot(v, -3) < 0) { - std::stringstream msg; + std::ostringstream msg; msg << "Couldn't register class'Text'"; throw SquirrelError(v, msg.str()); } - // Register class A - sq_pushstring(v, "A", -1); - if(sq_newclass(v, SQFalse) < 0) { - std::stringstream msg; - msg << "Couldn't create new class 'A'"; - throw SquirrelError(v, msg.str()); - } - if(sq_createslot(v, -3) < 0) { - std::stringstream msg; - msg << "Couldn't register class'A'"; - throw SquirrelError(v, msg.str()); - } - - // Register class B - sq_pushstring(v, "B", -1); - sq_pushstring(v, "A", -1); - sq_get(v, -3); - if(sq_newclass(v, SQTrue) < 0) { - std::stringstream msg; - msg << "Couldn't create new class 'B'"; - throw SquirrelError(v, msg.str()); - } - if(sq_createslot(v, -3) < 0) { - std::stringstream msg; - msg << "Couldn't register class'B'"; - throw SquirrelError(v, msg.str()); - } - // Register class Player sq_pushstring(v, "Player", -1); if(sq_newclass(v, SQFalse) < 0) { - std::stringstream msg; + std::ostringstream msg; msg << "Couldn't create new class 'Player'"; throw SquirrelError(v, msg.str()); } sq_pushstring(v, "set_bonus", -1); sq_newclosure(v, &Player_set_bonus_wrapper, 0); if(sq_createslot(v, -3) < 0) { - std::stringstream msg; + std::ostringstream msg; msg << "Couldn't register function'set_bonus'"; throw SquirrelError(v, msg.str()); } @@ -841,7 +1003,7 @@ void register_supertux_wrapper(HSQUIRRELVM v) sq_pushstring(v, "make_invincible", -1); sq_newclosure(v, &Player_make_invincible_wrapper, 0); if(sq_createslot(v, -3) < 0) { - std::stringstream msg; + std::ostringstream msg; msg << "Couldn't register function'make_invincible'"; throw SquirrelError(v, msg.str()); } @@ -849,7 +1011,7 @@ void register_supertux_wrapper(HSQUIRRELVM v) sq_pushstring(v, "add_life", -1); sq_newclosure(v, &Player_add_life_wrapper, 0); if(sq_createslot(v, -3) < 0) { - std::stringstream msg; + std::ostringstream msg; msg << "Couldn't register function'add_life'"; throw SquirrelError(v, msg.str()); } @@ -857,16 +1019,19 @@ void register_supertux_wrapper(HSQUIRRELVM v) sq_pushstring(v, "add_coins", -1); sq_newclosure(v, &Player_add_coins_wrapper, 0); if(sq_createslot(v, -3) < 0) { - std::stringstream msg; + std::ostringstream msg; msg << "Couldn't register function'add_coins'"; throw SquirrelError(v, msg.str()); } if(sq_createslot(v, -3) < 0) { - std::stringstream msg; + std::ostringstream msg; msg << "Couldn't register class'Player'"; throw SquirrelError(v, msg.str()); } sq_pop(v, 1); } + +} +