From 5e5e0c99c3d38fd820532416230d83eb802e39ab Mon Sep 17 00:00:00 2001 From: GravisZro Date: Thu, 23 May 2024 23:27:12 -0400 Subject: [PATCH] Replace "short" with "int16_t" and fix missing headers --- 2dlib/font.cpp | 6 +- 2dlib/lib2d.h | 2 +- 2dlib/memsurf.cpp | 2 +- Descent3/AImain.cpp | 12 +- Descent3/BOA.cpp | 34 +- Descent3/CtlCfgElem.cpp | 4 +- Descent3/CtlCfgElem.h | 2 +- Descent3/LoadLevel.cpp | 26 +- Descent3/LoadLevel.h | 2 +- Descent3/OsirisLoadandBind.cpp | 10 +- Descent3/Player.cpp | 4 +- Descent3/SLEW.cpp | 8 +- Descent3/TelcomEffectsRender.cpp | 6 +- Descent3/WeaponFire.cpp | 4 +- Descent3/aiambient.cpp | 2 +- Descent3/aistruct.h | 30 +- Descent3/audiotaunts.cpp | 16 +- Descent3/bnode.cpp | 4 +- Descent3/bnode.h | 6 +- Descent3/bsp.h | 4 +- Descent3/config.cpp | 20 +- Descent3/ctlconfig.cpp | 34 +- Descent3/ctlconfig.h | 10 +- Descent3/demofile.cpp | 74 +-- Descent3/descent.cpp | 2 +- Descent3/door.h | 2 +- Descent3/fireball.cpp | 4 +- Descent3/fireball.h | 2 +- Descent3/gamecinematics.cpp | 14 +- Descent3/gamesave.cpp | 24 +- Descent3/gamesave.h | 16 +- Descent3/gamesequence.cpp | 2 +- Descent3/gametexture.h | 6 +- Descent3/hotspotmap.cpp | 6 +- Descent3/hud.cpp | 20 +- Descent3/hud.h | 12 +- Descent3/hudmessage.cpp | 12 +- Descent3/levelgoal.cpp | 2 +- Descent3/lighting.cpp | 2 +- Descent3/lightmap_info.h | 2 +- Descent3/loadstate.cpp | 38 +- Descent3/matcen.cpp | 12 +- Descent3/matcen.h | 12 +- Descent3/mission_download.cpp | 2 +- Descent3/mmItem.h | 8 +- Descent3/multi.cpp | 68 +-- Descent3/multi.h | 12 +- Descent3/multi_client.cpp | 2 +- Descent3/multi_dll_mgr.cpp | 4 +- Descent3/multi_external.h | 14 +- Descent3/newui_core.cpp | 130 +++--- Descent3/newui_core.h | 108 ++--- Descent3/object.cpp | 6 +- Descent3/object.h | 2 +- Descent3/objinfo.h | 8 +- Descent3/osiris_predefs.cpp | 16 +- Descent3/osiris_predefs.h | 8 +- Descent3/pilot.cpp | 2 +- Descent3/player.h | 2 +- Descent3/postrender.h | 8 +- Descent3/powerup.h | 2 +- Descent3/procedurals.cpp | 22 +- Descent3/procedurals.h | 2 +- Descent3/render.cpp | 24 +- Descent3/render.h | 8 +- Descent3/room_external.h | 34 +- Descent3/screens.cpp | 6 +- Descent3/terrain.cpp | 4 +- Descent3/terrain.h | 14 +- Descent3/trigger.h | 4 +- Descent3/vclip.cpp | 2 +- Descent3/vclip.h | 4 +- Descent3/viseffect.cpp | 8 +- Descent3/viseffect_external.h | 6 +- Descent3/weapon.cpp | 2 +- Descent3/weapon.h | 24 +- bitmap/iff.cpp | 16 +- bitmap/tga.cpp | 8 +- cfile/cfile.cpp | 6 +- cfile/cfile.h | 4 +- d3music/musicapi.cpp | 10 +- ddebug/winmono.cpp | 22 +- ddio_common/key.cpp | 2 +- ddio_lnx/lnxforcefeedback.cpp | 10 +- ddio_lnx/lnxmouse.cpp | 4 +- ddio_win/winforcefeedback.cpp | 14 +- ddio_win/winjoy.cpp | 6 +- ddio_win/winmouse.cpp | 30 +- grtext/grfont.cpp | 18 +- grtext/grtext.cpp | 20 +- legacy/D3Launch/UpdateDlg.cpp | 2 +- legacy/FontEditor/FontCreate.cpp | 8 +- legacy/FontEditor/FontKern.cpp | 2 +- legacy/editor/DallasMainDlg.cpp | 20 +- legacy/editor/Erooms.cpp | 20 +- legacy/editor/Erooms.h | 4 +- legacy/editor/GrFontDialog.cpp | 4 +- legacy/editor/GrFontDialog.h | 4 +- legacy/editor/HRoom.cpp | 18 +- legacy/editor/ObjectClipboard.cpp | 2 +- legacy/editor/ObjectPropertiesDialog.h | 2 +- legacy/editor/PropertyPhysicsDlg.h | 2 +- legacy/editor/Read3ds.cpp | 12 +- legacy/editor/ScriptCompilerAPI.cpp | 8 +- legacy/editor/WaterProceduralDialog.h | 2 +- legacy/editor/drawworld.cpp | 6 +- legacy/editor/ebnode.cpp | 4 +- legacy/inetfile/inetgetfile.cpp | 4 +- legacy/mtclient/chat_api.cpp | 2 +- legacy/mtclient/chat_api.h | 2 +- legacy/mtclient/mtclient.h | 6 +- legacy/powerball/powerball.h | 4 +- legacy/renderer/Direct3D.cpp | 4 +- lib/3d.h | 6 +- lib/Controller.h | 2 +- lib/PHYSICS.H | 2 +- lib/bitmap.h | 2 +- lib/bumpmap.h | 2 +- lib/collide.h | 2 +- lib/d3music.h | 8 +- lib/ddio_common.h | 2 +- lib/dedicated_server.h | 2 +- lib/demofile.h | 10 +- lib/findintersection.h | 6 +- lib/forcefeedback.h | 10 +- lib/gr.h | 10 +- lib/grtext.h | 10 +- lib/lightmap.h | 2 +- lib/linux/oelnx_os.h | 2 +- lib/megacell.h | 2 +- lib/movie.h | 6 +- lib/mvelibw.h | 2 +- lib/polymodel_external.h | 10 +- lib/psclass.h | 4 +- lib/ui.h | 6 +- lib/win/win32app.h | 2 +- libmve/mvelibi.h | 2 +- libmve/mvelibl.cpp | 4 +- libmve/mvelibl.h | 2 +- libmve/snd8to16.h | 2 +- linux/lnxcon.cpp | 4 +- lnxmvelib/mvelibl.cpp | 4 +- lnxmvelib/mvelibl.h | 2 +- md5/md5.cpp | 6 +- md5/md5.h | 2 +- md5/tests/md5_tests.cpp | 2 +- model/newstyle.cpp | 6 +- model/polymodel.cpp | 2 +- movie/d3movie.cpp | 6 +- music/music.h | 28 +- music/omflex.cpp | 8 +- music/sequencer.cpp | 12 +- music/tracklist.cpp | 2 +- netcon/includes/CFtp.h | 2 + netcon/includes/Chttpget.h | 2 + netcon/includes/inetgetfile.h | 2 +- netcon/inetfile/inetgetfile.cpp | 4 +- netgames/anarchy/Anarchy.h | 4 +- netgames/coop/coop.h | 4 +- netgames/ctf/ctf.cpp | 2 +- netgames/ctf/ctf.h | 4 +- netgames/dmfc/dmfcfunctions.cpp | 10 +- netgames/entropy/Entropy.h | 4 +- netgames/hoard/Hoard.h | 4 +- netgames/hyperanarchy/HyperAnarchy.h | 4 +- netgames/includes/gamedll_header.h | 18 +- netgames/monsterball/monsterball.h | 4 +- netgames/roboanarchy/roboAnarchy.h | 4 +- netgames/tanarchy/tanDMFC.h | 4 +- networking/networking.cpp | 32 +- physics/FindIntersection.cpp | 40 +- physics/physics.cpp | 14 +- renderer/HardwarePoints.cpp | 2 +- scripts/AIGame.cpp | 188 ++++---- scripts/AIGame3.cpp | 36 +- scripts/BatteriesIncluded.cpp | 160 +++---- scripts/BossCamera.cpp | 16 +- scripts/CanyonsCTF.cpp | 12 +- scripts/CellTestLevel.cpp | 12 +- scripts/ChrisTest.cpp | 16 +- scripts/Geodomes.cpp | 28 +- scripts/HalfPipe.cpp | 28 +- scripts/InfernalBolt.cpp | 20 +- scripts/Inversion.cpp | 92 ++-- scripts/LEVEL0.cpp | 100 ++-- scripts/LEVEL15.cpp | 236 +++++----- scripts/Level12.cpp | 464 +++++++++---------- scripts/Level16.cpp | 36 +- scripts/Level6.cpp | 236 +++++----- scripts/Level9.cpp | 188 ++++---- scripts/LevelS1.cpp | 40 +- scripts/Merc02.cpp | 260 +++++------ scripts/Merc1.cpp | 460 +++++++++---------- scripts/Merc3.cpp | 468 +++++++++---------- scripts/Merc4.cpp | 160 +++---- scripts/Merc6.cpp | 204 ++++----- scripts/Merc7.cpp | 350 +++++++------- scripts/Mysterious_Isle.cpp | 56 +-- scripts/Paranoia.cpp | 12 +- scripts/PiccuStation.cpp | 308 ++++++------- scripts/Polaris.cpp | 32 +- scripts/Quadsomniac.cpp | 44 +- scripts/RudeAwakening.cpp | 44 +- scripts/SewerRat.cpp | 12 +- scripts/TrainingMission.cpp | 128 +++--- scripts/Y2K.cpp | 12 +- scripts/aigame2.cpp | 18 +- scripts/aigame4.cpp | 32 +- scripts/barney.cpp | 12 +- scripts/clutter.cpp | 34 +- scripts/generic.cpp | 24 +- scripts/level1.cpp | 108 ++--- scripts/level10.cpp | 344 +++++++------- scripts/level11.cpp | 604 ++++++++++++------------- scripts/level13.cpp | 436 +++++++++--------- scripts/level14.cpp | 196 ++++---- scripts/level17.cpp | 540 +++++++++++----------- scripts/level2.cpp | 276 +++++------ scripts/level3.cpp | 264 +++++------ scripts/level4.cpp | 68 +-- scripts/level5.cpp | 140 +++--- scripts/level7.cpp | 272 +++++------ scripts/level8.cpp | 256 +++++------ scripts/levelS2.cpp | 544 +++++++++++----------- scripts/lnx/osiris_common.h | 10 +- scripts/lnx/osiris_import.h | 12 +- scripts/lnx/osiris_vector.h | 2 +- scripts/merc5.cpp | 200 ++++---- scripts/myPowerHouse.cpp | 16 +- scripts/orbital.cpp | 20 +- scripts/osiris_import.h | 12 +- scripts/testscript.cpp | 16 +- sndlib/ddsoundload.cpp | 10 +- sndlib/ds3dlib.cpp | 32 +- sndlib/ds3dlib.h | 4 +- sndlib/ds3dlib_internal.h | 4 +- sndlib/dsound3d.cpp | 2 +- sndlib/hlsoundlib.cpp | 2 +- sndlib/mixer.cpp | 86 ++-- sndlib/mixer.h | 4 +- sndlib/sdlsound.cpp | 8 +- sndlib/sdlsound.h | 4 +- sndlib/sndrender.cpp | 6 +- sndlib/sndrender.h | 4 +- sndlib/ssl_lib.h | 2 +- stream_audio/streamaudio.h | 8 +- win32/winapp.cpp | 4 +- win32/windata.cpp | 2 +- 248 files changed, 5431 insertions(+), 5423 deletions(-) diff --git a/2dlib/font.cpp b/2dlib/font.cpp index 34e69f83..0a0ac75c 100644 --- a/2dlib/font.cpp +++ b/2dlib/font.cpp @@ -142,7 +142,7 @@ typedef CFILE *FONTFILE; static inline int READ_FONT_INT(FONTFILE ffile); -static inline short READ_FONT_SHORT(FONTFILE ffile); +static inline int16_t READ_FONT_SHORT(FONTFILE ffile); static inline uint8_t READ_FONT_BYTE(FONTFILE ffile); static inline int READ_FONT_DATA(FONTFILE ffile, void *buf, int size, int nelem); static inline FONTFILE OPEN_FONT(char *filename, bool &success); @@ -153,7 +153,7 @@ static inline void CLOSE_FONT(FONTFILE ffile); inline int READ_FONT_INT(FONTFILE ffile) { return cf_ReadInt(ffile); } -inline short READ_FONT_SHORT(FONTFILE ffile) { return cf_ReadShort(ffile); } +inline int16_t READ_FONT_SHORT(FONTFILE ffile) { return cf_ReadShort(ffile); } inline uint8_t READ_FONT_BYTE(FONTFILE ffile) { return (uint8_t)cf_ReadByte(ffile); } @@ -405,7 +405,7 @@ void grFont::load(char *filename, int slot) { // Read in all widths if (ft->flags & FT_PROPORTIONAL) { - ft->char_widths = new short[num_char]; + ft->char_widths = new int16_t[num_char]; for (i = 0; i < num_char; i++) ft->char_widths[i] = READ_FONT_SHORT(ff); mprintf((0, "::proportional")); diff --git a/2dlib/lib2d.h b/2dlib/lib2d.h index f4248658..ef65b6e0 100644 --- a/2dlib/lib2d.h +++ b/2dlib/lib2d.h @@ -30,7 +30,7 @@ typedef struct mem_bitmap { char *data; - short bpp; + int16_t bpp; int rowsize; uint16_t alloced : 2; uint16_t flag : 14; diff --git a/2dlib/memsurf.cpp b/2dlib/memsurf.cpp index 0f6d5693..4a70eeca 100644 --- a/2dlib/memsurf.cpp +++ b/2dlib/memsurf.cpp @@ -224,7 +224,7 @@ bool gr_mem_surf_Init(ddgr_surface *sf, char *data, int rowsize) { mbm->data = data; mbm->rowsize = rowsize; - mbm->bpp = (short)sf->bpp; + mbm->bpp = (int16_t)sf->bpp; mbm->flag = 0; sf->obj = (void *)mbm; diff --git a/Descent3/AImain.cpp b/Descent3/AImain.cpp index 59aadfde..a86f2955 100644 --- a/Descent3/AImain.cpp +++ b/Descent3/AImain.cpp @@ -3146,7 +3146,7 @@ bool AINotify(object *obj, uint8_t notify_type, void *info) { int i; if (hptr->f_directly_player) { - short heard_noise_obj[50]; + int16_t heard_noise_obj[50]; int num_objs = fvi_QuickDistObjectList(&obj->pos, obj->roomnum, hptr->max_dist, heard_noise_obj, 50, false, true, false, true); @@ -4297,7 +4297,7 @@ void AIDoTrackFrame(object *obj) { track_distance = GoalDetermineTrackDist(obj); if (track_distance > 0.0f) { - short near_objs[10]; + int16_t near_objs[10]; int num_near = fvi_QuickDistObjectList(&obj->pos, obj->roomnum, ai_info->avoid_friends_distance + track_distance, near_objs, 10, false, true, false, true); float dist; @@ -4740,7 +4740,7 @@ void ai_move(object *obj) { f_goal_found = true; - short near_objs[10]; + int16_t near_objs[10]; float avoid_dist; @@ -5088,7 +5088,7 @@ void ai_move(object *obj) { } if (obj->movement_type == MT_WALKING) { - short robots[6]; + int16_t robots[6]; int num_robots = fvi_QuickDistObjectList(&obj->pos, obj->roomnum, 30.0f, robots, 6, false, true, false, true); vector d = Zero_vector; @@ -5942,7 +5942,7 @@ void AIDetermineTarget(object *obj) { if ((ai_info->flags & AIF_TEAM_MASK) == AIF_TEAM_NEUTRAL || (ai_info->flags & AIF_ACT_AS_NEUTRAL_UNTIL_SHOT)) { best_obj = NULL; } else if ((ai_info->flags & AIF_TEAM_MASK) != AIF_TEAM_PTMC) { - short list[50]; + int16_t list[50]; int num = fvi_QuickDistObjectList(&obj->pos, obj->roomnum, MAX_SEE_TARGET_DIST, list, 50, false, true, false, true); for (i = 0; i < num; i++) { @@ -6062,7 +6062,7 @@ void AIDoMemFrame(object *obj) { ai_info->mem_time_till_next_update = 3.0f + (float)ps_rand() / (float)D3_RAND_MAX * 2.0f; // Do the amount of friends/enemies left and the current shields before running Freud - short near_objs[100]; + int16_t near_objs[100]; float dist = 100.0f; // chrishack -- there must be a better way... diff --git a/Descent3/BOA.cpp b/Descent3/BOA.cpp index ad21b4c4..a7951dd1 100644 --- a/Descent3/BOA.cpp +++ b/Descent3/BOA.cpp @@ -2100,7 +2100,7 @@ void MakeBOA(void) { static int Current_sort_room; -static int face_sort_func1(const short *a, const short *b) { +static int face_sort_func1(const int16_t *a, const int16_t *b) { if (Rooms[Current_sort_room].faces[*a].min_xyz.y > Rooms[Current_sort_room].faces[*b].min_xyz.y) return -1; else if (Rooms[Current_sort_room].faces[*a].min_xyz.y < Rooms[Current_sort_room].faces[*b].min_xyz.y) @@ -2109,7 +2109,7 @@ static int face_sort_func1(const short *a, const short *b) { return 0; } -static int face_sort_func2(const short *a, const short *b) { +static int face_sort_func2(const int16_t *a, const int16_t *b) { if (Rooms[Current_sort_room].faces[*a].max_xyz.y < Rooms[Current_sort_room].faces[*b].max_xyz.y) return -1; else if (Rooms[Current_sort_room].faces[*a].max_xyz.y > Rooms[Current_sort_room].faces[*b].max_xyz.y) @@ -2143,21 +2143,21 @@ void ComputeAABB(bool f_full) { } } - short *num_structs_per_room = (short *)mem_malloc((Highest_room_index + 1) * sizeof(short)); - short **r_struct_list; + int16_t *num_structs_per_room = (int16_t *)mem_malloc((Highest_room_index + 1) * sizeof(int16_t)); + int16_t **r_struct_list; // Allocate the structure that tells what struct each face is in - r_struct_list = (short **)mem_malloc((Highest_room_index + 1) * sizeof(short *)); + r_struct_list = (int16_t **)mem_malloc((Highest_room_index + 1) * sizeof(int16_t *)); for (i = 0; i <= Highest_room_index; i++) { if (Rooms[i].used) { if (BOA_AABB_ROOM_checksum[i] != 0 && BOA_AABB_ROOM_checksum[i] == computed_room_check[i]) continue; - r_struct_list[i] = (short *)mem_malloc(Rooms[i].num_faces * sizeof(short)); + r_struct_list[i] = (int16_t *)mem_malloc(Rooms[i].num_faces * sizeof(int16_t)); } } - short count; + int16_t count; BOA_AABB_checksum = cur_check; mprintf((0, " (full)!\n")); @@ -2244,12 +2244,12 @@ void ComputeAABB(bool f_full) { if (BOA_AABB_ROOM_checksum[i] != 0 && BOA_AABB_ROOM_checksum[i] == computed_room_check[i]) continue; - short *nfaces; + int16_t *nfaces; bool *used; int n_new; - nfaces = (short *)mem_malloc(sizeof(short) * rp->num_faces); + nfaces = (int16_t *)mem_malloc(sizeof(int16_t) * rp->num_faces); used = (bool *)mem_malloc(sizeof(bool) * rp->num_faces); for (count1 = 0; count1 < rp->num_faces; count1++) { @@ -2418,11 +2418,11 @@ void ComputeAABB(bool f_full) { // temporary malloc rp->num_bbf_regions = 27 + num_structs_per_room[i] - 1; - rp->bbf_list = (short **)mem_malloc(MAX_REGIONS_PER_ROOM * sizeof(short *)); + rp->bbf_list = (int16_t **)mem_malloc(MAX_REGIONS_PER_ROOM * sizeof(int16_t *)); for (x = 0; x < MAX_REGIONS_PER_ROOM; x++) { - rp->bbf_list[x] = (short *)mem_malloc(rp->num_faces * sizeof(short)); + rp->bbf_list[x] = (int16_t *)mem_malloc(rp->num_faces * sizeof(int16_t)); } - rp->num_bbf = (short *)mem_malloc(MAX_REGIONS_PER_ROOM * sizeof(short)); + rp->num_bbf = (int16_t *)mem_malloc(MAX_REGIONS_PER_ROOM * sizeof(int16_t)); rp->bbf_list_min_xyz = (vector *)mem_malloc(MAX_REGIONS_PER_ROOM * sizeof(vector)); rp->bbf_list_max_xyz = (vector *)mem_malloc(MAX_REGIONS_PER_ROOM * sizeof(vector)); rp->bbf_list_sector = (uint8_t *)mem_malloc(MAX_REGIONS_PER_ROOM * sizeof(uint8_t)); @@ -2706,7 +2706,7 @@ void ComputeAABB(bool f_full) { if (rp->num_bbf[i] == 0) { for (j = i + 1; j < rp->num_bbf_regions; j++) { - short *temp = rp->bbf_list[j - 1]; + int16_t *temp = rp->bbf_list[j - 1]; rp->bbf_list[j - 1] = rp->bbf_list[j]; rp->bbf_list[j] = temp; @@ -2841,7 +2841,7 @@ void ComputeAABB(bool f_full) { if (rp->num_bbf[i] == 0) { for (j = i + 1; j < rp->num_bbf_regions; j++) { - short *temp = rp->bbf_list[j - 1]; + int16_t *temp = rp->bbf_list[j - 1]; rp->bbf_list[j - 1] = rp->bbf_list[j]; rp->bbf_list[j] = temp; @@ -2960,14 +2960,14 @@ void ComputeAABB(bool f_full) { continue; for (j = 0; j < rp->num_bbf_regions; j++) { - rp->bbf_list[j] = (short *)mem_realloc(rp->bbf_list[j], (sizeof(short) * rp->num_bbf[j])); + rp->bbf_list[j] = (int16_t *)mem_realloc(rp->bbf_list[j], (sizeof(int16_t) * rp->num_bbf[j])); } for (j = rp->num_bbf_regions; j < MAX_REGIONS_PER_ROOM; j++) { mem_free(rp->bbf_list[j]); } - rp->bbf_list = (short **)mem_realloc(rp->bbf_list, rp->num_bbf_regions * sizeof(short *)); - rp->num_bbf = (short *)mem_realloc(rp->num_bbf, rp->num_bbf_regions * sizeof(short)); + rp->bbf_list = (int16_t **)mem_realloc(rp->bbf_list, rp->num_bbf_regions * sizeof(int16_t *)); + rp->num_bbf = (int16_t *)mem_realloc(rp->num_bbf, rp->num_bbf_regions * sizeof(int16_t)); rp->bbf_list_min_xyz = (vector *)mem_realloc(rp->bbf_list_min_xyz, rp->num_bbf_regions * sizeof(vector)); rp->bbf_list_max_xyz = (vector *)mem_realloc(rp->bbf_list_max_xyz, rp->num_bbf_regions * sizeof(vector)); rp->bbf_list_sector = diff --git a/Descent3/CtlCfgElem.cpp b/Descent3/CtlCfgElem.cpp index 70239f60..fb1675f4 100644 --- a/Descent3/CtlCfgElem.cpp +++ b/Descent3/CtlCfgElem.cpp @@ -385,7 +385,7 @@ static char Ctltext_KeyBindings[][16] = {"", "", ""}; -static short key_binding_indices[] = { +static int16_t key_binding_indices[] = { KEY_BACKSP, KEY_TAB, KEY_ENTER, KEY_LCTRL, KEY_LSHIFT, KEY_RSHIFT, KEY_PADMULTIPLY, KEY_LALT, KEY_SPACEBAR, KEY_CAPSLOCK, 0x45, KEY_SCROLLOCK, KEY_PAD7, KEY_PAD8, KEY_PAD9, KEY_PADMINUS, KEY_PAD4, KEY_PAD5, KEY_PAD6, KEY_PADPLUS, KEY_PAD1, KEY_PAD2, KEY_PAD3, KEY_PAD0, @@ -534,7 +534,7 @@ UIBitmapItem *cfg_element::m_btn_bmp_lit = NULL; UIBitmapItem *cfg_element::m_btn_bmp = NULL; UIBitmapItem *cfg_element::m_xbtn_bmp_lit = NULL; UIBitmapItem *cfg_element::m_xbtn_bmp = NULL; -short cfg_element::m_count = 0; +int16_t cfg_element::m_count = 0; // MTS: unused? bool key_cfg_element(uint8_t *element, uint8_t *flags); diff --git a/Descent3/CtlCfgElem.h b/Descent3/CtlCfgElem.h index b89758e9..b7ace978 100644 --- a/Descent3/CtlCfgElem.h +++ b/Descent3/CtlCfgElem.h @@ -91,7 +91,7 @@ // class cfg_element : public UIGadget { static UIBitmapItem *m_btn_bmp_lit, *m_btn_bmp, *m_xbtn_bmp_lit, *m_xbtn_bmp; - static short m_count; + static int16_t m_count; const char *m_title; int8_t m_fnid, m_flags; // fnflags : 1 if invert btn visible int8_t m_slot, m_curslot; // what slow is in focus and number of slots. diff --git a/Descent3/LoadLevel.cpp b/Descent3/LoadLevel.cpp index 2f4d1d7e..f760adb7 100644 --- a/Descent3/LoadLevel.cpp +++ b/Descent3/LoadLevel.cpp @@ -1323,9 +1323,9 @@ int Num_lightmap_infos_read = 0; uint16_t LightmapInfoRemap[MAX_LIGHTMAP_INFOS]; // Arrays for mapping saved data to the current data -short texture_xlate[MAX_TEXTURES]; -short door_xlate[MAX_DOORS]; -short generic_xlate[MAX_OBJECT_IDS]; +int16_t texture_xlate[MAX_TEXTURES]; +int16_t door_xlate[MAX_DOORS]; +int16_t generic_xlate[MAX_OBJECT_IDS]; #ifdef EDITOR extern float GlobalMultiplier; @@ -1341,7 +1341,7 @@ extern float GlobalMultiplier; #define MAX_FAILED_XLATE_ITEMS 1500 struct { - short type, id; + int16_t type, id; char name[PAGENAME_LEN]; } Failed_xlate_items[MAX_FAILED_XLATE_ITEMS]; @@ -1759,7 +1759,7 @@ int ReadObject(CFILE *ifile, object *objp, int handle, int fileversion) { } if (fileversion >= LEVEL_FILE_SCRIPTPARMS) { - short s = cf_ReadShort(ifile); + int16_t s = cf_ReadShort(ifile); for (i = 0; i < s; i++) { int8_t stype = cf_ReadByte(ifile); @@ -1927,7 +1927,7 @@ int ReadTrigger(CFILE *ifile, trigger *tp, int fileversion) { cf_ReadString(name, MAX_D3XID_NAME, ifile); if (fileversion >= LEVEL_FILE_TRIGPARMS) { int i; - short s = cf_ReadShort(ifile); + int16_t s = cf_ReadShort(ifile); for (i = 0; i < s; i++) { int8_t type = cf_ReadByte(ifile); if (type == PARMTYPE_NUMBER || type == PARMTYPE_REF) { @@ -2281,7 +2281,7 @@ int WriteCompressionByte(CFILE *fp, uint8_t *val, int total, int just_count, int return written; } -// Does a RLE compression run of the values given the short array 'val'. +// Does a RLE compression run of the values given the int16_t array 'val'. // If just_count is 1, doesn't write anything int WriteCompressionShort(CFILE *fp, uint16_t *val, int total, int just_count, int compress) { int done = 0, written = 0; @@ -2632,7 +2632,7 @@ int ReadRoom(CFILE *ifile, room *rp, int version) { } // Build a translation table for various items -void BuildXlateTable(CFILE *ifile, int (*lookup_func)(const char *), short *xlate_table, int max_items, int type) { +void BuildXlateTable(CFILE *ifile, int (*lookup_func)(const char *), int16_t *xlate_table, int max_items, int type) { char name[PAGENAME_LEN]; int n; int i; @@ -3046,7 +3046,7 @@ void ReadBOAChunk(CFILE *fp, int version) { max_rooms = cf_ReadInt(fp); if (version < 62) { - cfseek(fp, sizeof(short) * max_rooms * max_rooms, SEEK_CUR); + cfseek(fp, sizeof(int16_t) * max_rooms * max_rooms, SEEK_CUR); mprintf((0, "We will need to remake boa. New cost structure added\n")); BOA_AABB_checksum = BOA_mine_checksum = 0; @@ -3056,7 +3056,7 @@ void ReadBOAChunk(CFILE *fp, int version) { ASSERT(max_rooms - 1 <= MAX_ROOMS + 8); if (version < 110 || (max_path_portals != MAX_PATH_PORTALS)) { - cfseek(fp, sizeof(short) * max_rooms * max_rooms + max_rooms * max_path_portals * sizeof(float), SEEK_CUR); + cfseek(fp, sizeof(int16_t) * max_rooms * max_rooms + max_rooms * max_path_portals * sizeof(float), SEEK_CUR); if (version >= 107) { // Read BOA terrain info (temporary, just so vis data works with multiplay) @@ -3144,15 +3144,15 @@ void ReadRoomAABBChunk(CFILE *fp, int version) { Rooms[i].bbf_max_xyz.z = cf_ReadFloat(fp); Rooms[i].num_bbf_regions = cf_ReadShort(fp); - Rooms[i].num_bbf = (short *)mem_malloc(sizeof(short) * Rooms[i].num_bbf_regions); - Rooms[i].bbf_list = (short **)mem_malloc(sizeof(short *) * Rooms[i].num_bbf_regions); + Rooms[i].num_bbf = (int16_t *)mem_malloc(sizeof(int16_t) * Rooms[i].num_bbf_regions); + Rooms[i].bbf_list = (int16_t **)mem_malloc(sizeof(int16_t *) * Rooms[i].num_bbf_regions); Rooms[i].bbf_list_min_xyz = (vector *)mem_malloc(sizeof(vector) * Rooms[i].num_bbf_regions); Rooms[i].bbf_list_max_xyz = (vector *)mem_malloc(sizeof(vector) * Rooms[i].num_bbf_regions); Rooms[i].bbf_list_sector = (uint8_t *)mem_malloc(sizeof(char) * Rooms[i].num_bbf_regions); for (j = 0; j < Rooms[i].num_bbf_regions; j++) { Rooms[i].num_bbf[j] = cf_ReadShort(fp); - Rooms[i].bbf_list[j] = (short *)mem_malloc(sizeof(short) * Rooms[i].num_bbf[j]); + Rooms[i].bbf_list[j] = (int16_t *)mem_malloc(sizeof(int16_t) * Rooms[i].num_bbf[j]); } for (j = 0; j < Rooms[i].num_bbf_regions; j++) { diff --git a/Descent3/LoadLevel.h b/Descent3/LoadLevel.h index 16fc95fe..fb4769be 100644 --- a/Descent3/LoadLevel.h +++ b/Descent3/LoadLevel.h @@ -695,7 +695,7 @@ inline void AppendToLevelChecksum(uint16_t val) { Level_md5->update(val); } -inline void AppendToLevelChecksum(short val) { +inline void AppendToLevelChecksum(int16_t val) { if (!Level_md5) { return; } diff --git a/Descent3/OsirisLoadandBind.cpp b/Descent3/OsirisLoadandBind.cpp index c68f9f6b..328b3b5b 100644 --- a/Descent3/OsirisLoadandBind.cpp +++ b/Descent3/OsirisLoadandBind.cpp @@ -444,7 +444,7 @@ typedef void DLLFUNCCALL (*ShutdownDLL_fp)(void); typedef int DLLFUNCCALL (*GetGOScriptID_fp)(const char *name, uint8_t isdoor); typedef void DLLFUNCCALL *(*CreateInstance_fp)(int id); typedef void DLLFUNCCALL (*DestroyInstance_fp)(int id, void *ptr); -typedef short DLLFUNCCALL (*CallInstanceEvent_fp)(int id, void *ptr, int event, tOSIRISEventInfo *data); +typedef int16_t DLLFUNCCALL (*CallInstanceEvent_fp)(int id, void *ptr, int event, tOSIRISEventInfo *data); typedef int DLLFUNCCALL (*GetTriggerScriptID_fp)(int trigger_room, int trigger_face); typedef int DLLFUNCCALL (*GetCOScriptList_fp)(int **list, int **id_list); typedef int DLLFUNCCALL (*SaveRestoreState_fp)(void *file_ptr, uint8_t saving_state); @@ -454,7 +454,7 @@ typedef void(DLLFUNCCALL *ShutdownDLL_fp)(void); typedef int(DLLFUNCCALL *GetGOScriptID_fp)(const char *name, uint8_t isdoor); typedef void *(DLLFUNCCALL *CreateInstance_fp)(int id); typedef void(DLLFUNCCALL *DestroyInstance_fp)(int id, void *ptr); -typedef short(DLLFUNCCALL *CallInstanceEvent_fp)(int id, void *ptr, int event, tOSIRISEventInfo *data); +typedef int16_t(DLLFUNCCALL *CallInstanceEvent_fp)(int id, void *ptr, int event, tOSIRISEventInfo *data); typedef int(DLLFUNCCALL *GetTriggerScriptID_fp)(int trigger_room, int trigger_face); typedef int(DLLFUNCCALL *GetCOScriptList_fp)(int **list, int **id_list); typedef int(DLLFUNCCALL *SaveRestoreState_fp)(void *file_ptr, uint8_t saving_state); @@ -1995,7 +1995,7 @@ bool Osiris_CallLevelEvent(int event, tOSIRISEventInfo *data) { if (instance) { data->me_handle = OBJECT_HANDLE_NONE; // its a level script!...no me - short ret; + int16_t ret; ret = OSIRIS_loaded_modules[dll_id].CallInstanceEvent(0, instance, event, data); if (aux_event != -1) { @@ -2058,7 +2058,7 @@ bool Osiris_CallTriggerEvent(int trignum, int event, tOSIRISEventInfo *ei) { instance = Triggers[trignum].osiris_script.script_instance; if (instance) { - short ret; + int16_t ret; ret = OSIRIS_loaded_modules[dll_id].CallInstanceEvent(script_id, instance, event, ei); if (aux_event != -1) { @@ -2144,7 +2144,7 @@ bool Osiris_CallEvent(object *obj, int event, tOSIRISEventInfo *data) { int dll_id; int aux_event = -1; // event value tOSIRISScript *os; - short ret = CONTINUE_CHAIN | CONTINUE_DEFAULT; + int16_t ret = CONTINUE_CHAIN | CONTINUE_DEFAULT; if (event == EVT_AI_NOTIFY) { switch (data->evt_ai_notify.notify_type) { diff --git a/Descent3/Player.cpp b/Descent3/Player.cpp index 8711352a..e0ff39b8 100644 --- a/Descent3/Player.cpp +++ b/Descent3/Player.cpp @@ -2022,8 +2022,8 @@ typedef struct tDeathSeq { poly_model *dying_model; - short fate; - short breakup_count; + int16_t fate; + int16_t breakup_count; float initial_death_time; float time_dying; float max_time_dying; diff --git a/Descent3/SLEW.cpp b/Descent3/SLEW.cpp index aa9c8af4..1deb2374 100644 --- a/Descent3/SLEW.cpp +++ b/Descent3/SLEW.cpp @@ -263,7 +263,7 @@ void SlewResetOrient(object *obj) { // Moves the object for one frame int SlewFrame(object *obj, int movement_limitations) { - static short old_joy_x = 0, old_joy_y = 0; // position last time around + static int16_t old_joy_x = 0, old_joy_y = 0; // position last time around int ret_flags = 0; vector svel, movement; // scaled velocity (per this frame) matrix rotmat, new_pm; @@ -325,9 +325,9 @@ int SlewFrame(object *obj, int movement_limitations) { rottime.x = key_timep1 - key_timep0; rottime.y = key_timeh1 - key_timeh0; rottime.z = key_timeb1 - key_timeb0; - rotang.p = (short)(65536.0 * rottime.x * ROT_SPEED * Slew_key_speed); - rotang.h = (short)(65536.0 * rottime.y * ROT_SPEED * Slew_key_speed); - rotang.b = (short)(65536.0 * rottime.z * ROT_SPEED * Slew_key_speed); + rotang.p = (int16_t)(65536.0 * rottime.x * ROT_SPEED * Slew_key_speed); + rotang.h = (int16_t)(65536.0 * rottime.y * ROT_SPEED * Slew_key_speed); + rotang.b = (int16_t)(65536.0 * rottime.z * ROT_SPEED * Slew_key_speed); // joystick movement #ifdef EDITOR diff --git a/Descent3/TelcomEffectsRender.cpp b/Descent3/TelcomEffectsRender.cpp index 40b432e8..c5f409b6 100644 --- a/Descent3/TelcomEffectsRender.cpp +++ b/Descent3/TelcomEffectsRender.cpp @@ -411,12 +411,12 @@ void RenderBmpStatic(tceffect *tce, float frametime, int xoff, int yoff, bool ok BltBmpToScreen(tce->pos_x + glitch_dx + xoff, tce->pos_y + glitch_dy + yoff, &tce->bmpinfo.chunk_bmp); tce->age += frametime; } -void BlurBitmapArea(uint16_t *srcbm, uint16_t *dstbm, short width, short height, short startx, short starty, short bmw) { +void BlurBitmapArea(uint16_t *srcbm, uint16_t *dstbm, int16_t width, int16_t height, int16_t startx, int16_t starty, int16_t bmw) { int pixel_count, blue_total, red_total, green_total; pixel_count = width * height; blue_total = red_total = green_total = 0; - short x, y; - short pos; + int16_t x, y; + int16_t pos; if (!pixel_count) return; diff --git a/Descent3/WeaponFire.cpp b/Descent3/WeaponFire.cpp index dc027ced..1641f0cc 100644 --- a/Descent3/WeaponFire.cpp +++ b/Descent3/WeaponFire.cpp @@ -1865,14 +1865,14 @@ int FireWeaponFromObject(object *obj, int weapon_num, int gun_num, bool f_force_ float diff_scale = DIFF_LEVEL / (MAX_DIFFICULTY_LEVELS - 1); float fs = (MAX_FIRE_SPREAD * (1.0f - diff_scale)) + (MIN_FIRE_SPREAD * diff_scale); - short fire_spread = obj->ai_info->fire_spread * fs; + int16_t fire_spread = obj->ai_info->fire_spread * fs; if ((obj->control_type == CT_AI && ((obj->ai_info->flags & AIF_TEAM_MASK) != AIF_TEAM_REBEL)) && fire_spread < Diff_ai_min_fire_spread[DIFF_LEVEL] * fs) { fire_spread = Diff_ai_min_fire_spread[DIFF_LEVEL] * fs; } - short half_fire_spread = fire_spread >> 1; + int16_t half_fire_spread = fire_spread >> 1; if (fire_spread > 0) { p = (ps_rand() % fire_spread) - half_fire_spread; diff --git a/Descent3/aiambient.cpp b/Descent3/aiambient.cpp index fff4d9c4..c9efea83 100644 --- a/Descent3/aiambient.cpp +++ b/Descent3/aiambient.cpp @@ -136,7 +136,7 @@ void ambient_life::ALReset() { void ambient_life::SaveData(CFILE *fp) { int i, j; - short len; + int16_t len; cf_WriteInt(fp, AL_VERSION); diff --git a/Descent3/aistruct.h b/Descent3/aistruct.h index 2b84fd92..f5b82ca2 100644 --- a/Descent3/aistruct.h +++ b/Descent3/aistruct.h @@ -508,7 +508,7 @@ typedef struct ai_move_path { vector pos; matrix orient; - short path_id; + int16_t path_id; } ai_move_path; typedef struct path_information { @@ -550,7 +550,7 @@ typedef struct goal_enabler { // plus it would make sure the our slots do not fill up in bad or degenerate ways. typedef struct gi_fire { - short cur_wb; // for ranged attack + int16_t cur_wb; // for ranged attack uint8_t cur_mask; // for ranged attack uint8_t melee_number; // this could be union'ed but it makes this struct word aligned } gi_fire; @@ -583,15 +583,15 @@ typedef struct { typedef struct { float rad; - short flags; + int16_t flags; char parent_ap; char child_ap; } g_attach; typedef struct { - short start_node; - short end_node; - short cur_node; + int16_t start_node; + int16_t end_node; + int16_t cur_node; } g_static_path; typedef struct goal_info { @@ -716,14 +716,14 @@ typedef struct ain_weapon_hit_info { typedef struct ai_mem { // Computed at end of memory frame float shields; - short num_enemies; - short num_friends; + int16_t num_enemies; + int16_t num_friends; // Incremented during the memory frame - short num_times_hit; - short num_enemy_shots_fired; - short num_hit_enemy; - short num_enemy_shots_dodged; + int16_t num_times_hit; + int16_t num_enemy_shots_fired; + int16_t num_hit_enemy; + int16_t num_enemy_shots_dodged; } ai_mem; //------------------------------------------------- @@ -757,7 +757,7 @@ typedef struct ai_frame { int sound[MAX_AI_SOUNDS]; // AI sounds, float last_sound_time[MAX_AI_SOUNDS]; - short last_played_sound_index; + int16_t last_played_sound_index; char movement_type; char movement_subtype; @@ -869,8 +869,8 @@ public: vector pos[MAX_NODES]; int roomnum[MAX_NODES]; - short num_nodes; - short use_count; + int16_t num_nodes; + int16_t use_count; int owner_handle; }; diff --git a/Descent3/audiotaunts.cpp b/Descent3/audiotaunts.cpp index 021ba087..410e3551 100644 --- a/Descent3/audiotaunts.cpp +++ b/Descent3/audiotaunts.cpp @@ -41,10 +41,10 @@ typedef struct { int sample_length; int np_sample_length; int samples_per_second; - short bits_per_sample; - short number_channels; + int16_t bits_per_sample; + int16_t number_channels; uint8_t *sample_8bit; - short *sample_16bit; + int16_t *sample_16bit; } tWaveFile; // returns: @@ -509,8 +509,8 @@ char taunt_LoadWaveFile(char *filename, tWaveFile *wave) { // Sound format information int samples_per_second; - short bits_per_sample; - short number_channels; + int16_t bits_per_sample; + int16_t number_channels; char error_code = 0; // Used to read temporary long values @@ -728,7 +728,7 @@ char taunt_LoadWaveFile(char *filename, tWaveFile *wave) { wave->sample_length = cksize / 2 + num_needed / 2; } - wave->sample_16bit = (short *)mem_malloc(cksize + num_needed); + wave->sample_16bit = (int16_t *)mem_malloc(cksize + num_needed); cf_ReadBytes((uint8_t *)wave->sample_16bit, cksize, cfptr); for (count = 0; count < (int)cksize / 2; count++) { @@ -757,12 +757,12 @@ char taunt_LoadWaveFile(char *filename, tWaveFile *wave) { if (wave->sample_16bit == NULL) { ASSERT(wave->sample_8bit); - wave->sample_16bit = (short *)mem_malloc(wave->sample_length * sizeof(short)); + wave->sample_16bit = (int16_t *)mem_malloc(wave->sample_length * sizeof(int16_t)); // NOTE: Interesting note on sound conversion: 16 bit sounds are signed (0 biase). 8 bit sounds are unsigned // (+128 biase). for (count = 0; count < (int)wave->sample_length; count++) { - wave->sample_16bit[count] = (((short)wave->sample_8bit[count]) - 128) * 256; + wave->sample_16bit[count] = (((int16_t)wave->sample_8bit[count]) - 128) * 256; } mem_free(wave->sample_8bit); diff --git a/Descent3/bnode.cpp b/Descent3/bnode.cpp index 9beeb480..c212879f 100644 --- a/Descent3/bnode.cpp +++ b/Descent3/bnode.cpp @@ -504,8 +504,8 @@ void BNode_ClearBNodeInfo(void) { } // Unused? -bool BNode_MakeSubPath(short sroom, short spnt, short eroom, short epnt, int flags, float size, short *roomlist, - short *pnts, int max_elements) { +bool BNode_MakeSubPath(int16_t sroom, int16_t spnt, int16_t eroom, int16_t epnt, int flags, float size, int16_t *roomlist, + int16_t *pnts, int max_elements) { return false; } diff --git a/Descent3/bnode.h b/Descent3/bnode.h index 6c3bec8e..a8e319c1 100644 --- a/Descent3/bnode.h +++ b/Descent3/bnode.h @@ -80,11 +80,11 @@ #define MAX_BNODES_PER_ROOM 127 typedef struct bn_edge { - short end_room; + int16_t end_room; char end_index; - short flags; - short cost; + int16_t flags; + int16_t cost; float max_rad; } bn_edge; diff --git a/Descent3/bsp.h b/Descent3/bsp.h index 398ede16..46eb0993 100644 --- a/Descent3/bsp.h +++ b/Descent3/bsp.h @@ -67,8 +67,8 @@ typedef struct { int nv; bspplane plane; - short roomnum; - short facenum; + int16_t roomnum; + int16_t facenum; int8_t subnum; int color; diff --git a/Descent3/config.cpp b/Descent3/config.cpp index 3190cea0..22c63d54 100644 --- a/Descent3/config.cpp +++ b/Descent3/config.cpp @@ -556,8 +556,8 @@ static void config_gamma() { newuiTiledWindow gamma_wnd; newuiSheet *sheet; tSliderSettings slider_set; - short *gamma_slider; - short curpos; + int16_t *gamma_slider; + int16_t curpos; int res, gamma_bitmap = -1; float init_gamma; @@ -772,11 +772,11 @@ struct sound_menu { newuiMenu *parent_menu; int ls_sound_id, sound_id; - short *fxvolume, *musicvolume; // volume sliders - short *fxquantity; // sound fx quantity limit + int16_t *fxvolume, *musicvolume; // volume sliders + int16_t *fxquantity; // sound fx quantity limit int *fxquality; // sfx quality low/high - short old_fxquantity; + int16_t old_fxquantity; #ifdef _DEBUG int *sndmixer; @@ -796,10 +796,10 @@ struct sound_menu { sheet->NewGroup(NULL, 0, 0); slider_set.type = SLIDER_UNITS_PERCENT; - fxvolume = sheet->AddSlider(TXT_SOUNDVOL, 10, (short)(Sound_system.GetMasterVolume() * 10), &slider_set); + fxvolume = sheet->AddSlider(TXT_SOUNDVOL, 10, (int16_t)(Sound_system.GetMasterVolume() * 10), &slider_set); slider_set.type = SLIDER_UNITS_PERCENT; - musicvolume = sheet->AddSlider(TXT_SNDMUSVOL, 10, (short)(D3MusicGetVolume() * 10), &slider_set); + musicvolume = sheet->AddSlider(TXT_SNDMUSVOL, 10, (int16_t)(D3MusicGetVolume() * 10), &slider_set); // sound fx quality radio list. if (GetFunctionMode() != GAME_MODE && GetFunctionMode() != EDITOR_GAME_MODE) { @@ -1184,7 +1184,7 @@ struct details_menu { int *objcomp; // object complexity radio bool *specmap, *headlight, *mirror, // check boxes *dynamic, *fog, *coronas, *procedurals, *powerup_halo, *scorches, *weapon_coronas; - short *pixel_err, // 0-27 (1-28) + int16_t *pixel_err, // 0-27 (1-28) *rend_dist; // 0-120 (80-200) int *texture_quality; @@ -1323,12 +1323,12 @@ void details_menu::set_preset_details(int setting) { iTemp = MAXIMUM_TERRAIN_DETAIL - ds.Pixel_error - MINIMUM_TERRAIN_DETAIL; if (iTemp < 0) iTemp = 0; - *pixel_err = (short)(iTemp); + *pixel_err = (int16_t)(iTemp); iTemp = (int)((ds.Terrain_render_distance / ((float)TERRAIN_SIZE)) - MINIMUM_RENDER_DIST); if (iTemp < 0) iTemp = 0; iTemp = iTemp / 2; - *rend_dist = (short)(iTemp); + *rend_dist = (int16_t)(iTemp); *objcomp = ds.Object_complexity; *specmap = ds.Specular_lighting; *headlight = ds.Fast_headlight_on; diff --git a/Descent3/ctlconfig.cpp b/Descent3/ctlconfig.cpp index 7ff72d1a..79bbf443 100644 --- a/Descent3/ctlconfig.cpp +++ b/Descent3/ctlconfig.cpp @@ -299,7 +299,7 @@ // used for adjusting settings. #define CFG_AXIS_SENS_RANGE 20 -const short UID_JOYCFG = 0x1000; +const int16_t UID_JOYCFG = 0x1000; // Setup of config screens. @@ -403,8 +403,8 @@ t_cfg_element Cfg_joy_elements[] = {{-1, CtlText_WeaponGroup, CCITEM_WPN_X2, CCI {ctfBANK_RIGHTBUTTON, CtlText_BankRight, 0, 0}}; #define N_JOY_CFG_FN (sizeof(Cfg_joy_elements) / sizeof(t_cfg_element)) #define N_KEY_CFG_FN (sizeof(Cfg_key_elements) / sizeof(t_cfg_element)) -static void ctl_cfg_set_and_verify_changes(short fnid, ct_type elem_type, uint8_t controller, uint8_t elem, int8_t slot); -static void ctl_cfg_element_options_dialog(short fnid); +static void ctl_cfg_set_and_verify_changes(int16_t fnid, ct_type elem_type, uint8_t controller, uint8_t elem, int8_t slot); +static void ctl_cfg_element_options_dialog(int16_t fnid); // used for adjusting settings. static int weapon_select_dialog(int wpn, bool is_secondary); #define UID_KEYCFG_ID 0x1000 @@ -473,9 +473,9 @@ void key_cfg_screen::process(int res) { int8_t slot; ct_type elem_type; if (m_elem[i].GetActiveSlot() == CFGELEM_SLOT_CLEAR) { - ctl_cfg_element_options_dialog((short)(res - UID_KEYCFG_ID)); + ctl_cfg_element_options_dialog((int16_t)(res - UID_KEYCFG_ID)); } else if (m_elem[i].Configure(&elem_type, &controller, &elem, &slot)) { - ctl_cfg_set_and_verify_changes((short)(res - UID_KEYCFG_ID), elem_type, controller, elem, slot); + ctl_cfg_set_and_verify_changes((int16_t)(res - UID_KEYCFG_ID), elem_type, controller, elem, slot); } break; } @@ -581,9 +581,9 @@ void joy_cfg_screen::process(int res) { int8_t slot; ct_type elem_type; if (m_elem[i].GetActiveSlot() == CFGELEM_SLOT_CLEAR) { - ctl_cfg_element_options_dialog((short)(res - UID_JOYCFG_ID)); + ctl_cfg_element_options_dialog((int16_t)(res - UID_JOYCFG_ID)); } else if (m_elem[i].Configure(&elem_type, &controller, &elem, &slot)) { - ctl_cfg_set_and_verify_changes((short)(res - UID_JOYCFG_ID), elem_type, controller, elem, slot); + ctl_cfg_set_and_verify_changes((int16_t)(res - UID_JOYCFG_ID), elem_type, controller, elem, slot); } break; } @@ -898,7 +898,7 @@ void wpnsel_cfg_screen::unrealize() { } ////////////////////////////////////////////////////////////////////////////// // this will take out any repeats of element and slot in function id. -void ctl_cfg_set_and_verify_changes(short fnid, ct_type elem_type, uint8_t ctrl, uint8_t elem, int8_t slot) { +void ctl_cfg_set_and_verify_changes(int16_t fnid, ct_type elem_type, uint8_t ctrl, uint8_t elem, int8_t slot) { ct_type ctype_fn[CTLBINDS_PER_FUNC]; uint8_t cfgflags_fn[CTLBINDS_PER_FUNC]; ct_config_data ccfgdata_fn; @@ -966,7 +966,7 @@ void ctl_cfg_set_and_verify_changes(short fnid, ct_type elem_type, uint8_t ctrl, Controller->set_controller_function(fnid, ctype_fn, ccfgdata_fn, cfgflags_fn); } // used as a help/options dialog for each controller config element -void ctl_cfg_element_options_dialog(short fnid) { +void ctl_cfg_element_options_dialog(int16_t fnid) { newuiTiledWindow wnd; newuiSheet *sheet; int *inv_binding[CTLBINDS_PER_FUNC]; @@ -1137,12 +1137,12 @@ void joystick_settings_dialog() { newuiTiledWindow wnd; newuiSheet *sheet; int res, i, y; - short curpos; + int16_t curpos; tSliderSettings slider_set; char axis_str[N_JOY_AXIS] = {'X', 'Y', 'Z', 'R', 'U', 'V'}; - short *joy_sens[N_JOY_AXIS]; - short *mse_sens[N_MOUSE_AXIS]; - short *ff_gain = NULL; + int16_t *joy_sens[N_JOY_AXIS]; + int16_t *mse_sens[N_MOUSE_AXIS]; + int16_t *ff_gain = NULL; bool *ff_enabled = NULL; bool *ff_auto_center = NULL; bool ff_auto_center_support = false; @@ -1208,7 +1208,7 @@ void joystick_settings_dialog() { // ---------------------------------------------- ff_auto_center = sheet->AddLongCheckBox(TXT_CFG_FFAUTOCENTER, ForceIsAutoCenter()); } - curpos = (short)(ForceGetGain() * 50.0f); + curpos = (int16_t)(ForceGetGain() * 50.0f); slider_set.type = SLIDER_UNITS_PERCENT; ff_gain = sheet->AddSlider(TXT_CFG_FORCEGAIN, 50, curpos, &slider_set); } @@ -1265,9 +1265,9 @@ void key_settings_dialog() { newuiTiledWindow wnd; newuiSheet *sheet; int res; - short curpos; + int16_t curpos; tSliderSettings slider_set; - short *key_ramp_speed; + int16_t *key_ramp_speed; wnd.Create(TXT_KEYSETTINGS, 0, 0, 384, 256); sheet = wnd.GetSheet(); sheet->NewGroup(NULL, 0, 30); @@ -1301,7 +1301,7 @@ typedef struct t_ctlcfgswitchcb_data { cfg_screen *curcfg; } t_ctlcfgswitchcb_data; // called when we switch menus -void CtlConfigSwitchCB(newuiMenu *menu, short old_option_id, short new_option_id, void *data) { +void CtlConfigSwitchCB(newuiMenu *menu, int16_t old_option_id, int16_t new_option_id, void *data) { t_ctlcfgswitchcb_data *cfgdata = (t_ctlcfgswitchcb_data *)data; // performs custom gadget deinitialization and reinitilization if (cfgdata->curcfg) { diff --git a/Descent3/ctlconfig.h b/Descent3/ctlconfig.h index f25c7c94..fb8731c4 100644 --- a/Descent3/ctlconfig.h +++ b/Descent3/ctlconfig.h @@ -53,15 +53,17 @@ #ifndef CTLCONFIG_H #define CTLCONFIG_H +#include + #define CTLCONFIG_KEYBOARD 0 #define CTLCONFIG_CONTROLLER 1 #define CTLCONFIG_WPNSEL 2 typedef struct t_cfg_element { - short fn_id; // -1 = group start - short text; // text string id. - short x; - short y; // location (for groups only) + int16_t fn_id; // -1 = group start + int16_t text; // text string id. + int16_t x; + int16_t y; // location (for groups only) } t_cfg_element; extern t_cfg_element Cfg_key_elements[]; diff --git a/Descent3/demofile.cpp b/Descent3/demofile.cpp index a0c6ed71..7b4bbc6c 100644 --- a/Descent3/demofile.cpp +++ b/Descent3/demofile.cpp @@ -468,7 +468,7 @@ void DemoWriteChangedObj(object *op) { } void DemoWriteWeaponFire(uint16_t objectnum, vector *pos, vector *dir, uint16_t weaponnum, - uint16_t weapobjnum, short gunnum) { + uint16_t weapobjnum, int16_t gunnum) { uint32_t uniqueid = MultiGetMatchChecksum(OBJ_WEAPON, weaponnum); if (weapobjnum == -1) return; @@ -558,7 +558,7 @@ void DemoReadTurretChanged(void) { float do_time; do_time = cf_ReadFloat(Demo_cfp); - short old_objnum = cf_ReadShort(Demo_cfp); + int16_t old_objnum = cf_ReadShort(Demo_cfp); objnum = Demo_obj_map[old_objnum]; turr_time = cf_ReadFloat(Demo_cfp); @@ -631,12 +631,12 @@ void DemoWriteKillObject(object *hit_obj, object *killer, float damage, int deat } void DemoReadKillObject(void) { - short hit_objnum = cf_ReadShort(Demo_cfp); - short killer = cf_ReadShort(Demo_cfp); + int16_t hit_objnum = cf_ReadShort(Demo_cfp); + int16_t killer = cf_ReadShort(Demo_cfp); float damage = cf_ReadFloat(Demo_cfp); int death_flags = cf_ReadInt(Demo_cfp); float delay = cf_ReadFloat(Demo_cfp); - short seed = cf_ReadShort(Demo_cfp); + int16_t seed = cf_ReadShort(Demo_cfp); if (!(IS_GENERIC(Objects[hit_objnum].type) || (Objects[hit_objnum].type == OBJ_DOOR))) return; // bail if invalid object type @@ -653,13 +653,13 @@ void DemoWritePlayerDeath(object *player, bool melee, int fate) { } void DemoReadPlayerDeath(void) { - short playernum = cf_ReadShort(Demo_cfp); + int16_t playernum = cf_ReadShort(Demo_cfp); uint8_t melee = cf_ReadByte(Demo_cfp); int fate = cf_ReadInt(Demo_cfp); InitiatePlayerDeath(&Objects[playernum], melee ? true : false, fate); } -void DemoWrite2DSound(short soundidx, float volume) { +void DemoWrite2DSound(int16_t soundidx, float volume) { cf_WriteByte(Demo_cfp, DT_2D_SOUND); cf_WriteShort(Demo_cfp, soundidx); cf_WriteFloat(Demo_cfp, volume); @@ -672,7 +672,7 @@ void DemoRead2DSound(void) { Sound_system.Play2dSound(soundidx, volume); } -void DemoWrite3DSound(short soundidx, uint16_t objnum, int priority, float volume) { +void DemoWrite3DSound(int16_t soundidx, uint16_t objnum, int priority, float volume) { cf_WriteByte(Demo_cfp, DT_3D_SOUND); cf_WriteShort(Demo_cfp, objnum); cf_WriteShort(Demo_cfp, soundidx); @@ -681,7 +681,7 @@ void DemoWrite3DSound(short soundidx, uint16_t objnum, int priority, float volum void DemoRead3DSound(void) { int objnum; - short soundidx; + int16_t soundidx; float volume; objnum = cf_ReadShort(Demo_cfp); @@ -737,7 +737,7 @@ int DemoPlaybackFile(char *filename) { extern bool IsRestoredGame; int DemoReadHeader() { char szsig[10]; - short ver; + int16_t ver; char demo_mission[_MAX_PATH]; int level_num; int frame_count; @@ -892,7 +892,7 @@ int DemoReadHeader() { } void DemoReadObj() { - short objnum; + int16_t objnum; object *obj; vector pos; matrix orient; @@ -945,7 +945,7 @@ void DemoReadWeaponFire() { float gametime; uint32_t uniqueid; object *obj; - short weaponnum, objnum, weapobjnum; + int16_t weaponnum, objnum, weapobjnum; vector laser_pos, laser_dir; // Mass driver is hack @@ -969,7 +969,7 @@ void DemoReadWeaponFire() { } gametime = cf_ReadFloat(Demo_cfp); - short old_objnum = cf_ReadShort(Demo_cfp); + int16_t old_objnum = cf_ReadShort(Demo_cfp); objnum = Demo_obj_map[old_objnum]; obj = &Objects[objnum]; ASSERT(Objects[objnum].type != OBJ_NONE); @@ -981,7 +981,7 @@ void DemoReadWeaponFire() { laser_dir = dir; weaponnum = MultiMatchWeapon(uniqueid); weapobjnum = cf_ReadShort(Demo_cfp); - short gunnum = cf_ReadShort(Demo_cfp); + int16_t gunnum = cf_ReadShort(Demo_cfp); ASSERT(uniqueid != 0xffffffff); ASSERT(dir != Zero_vector); @@ -1007,7 +1007,7 @@ void DemoReadWeaponFire() { weapobjnum)); Demo_obj_map[weapobjnum] = new_weap_objnum; - short weapon_num = weaponnum; + int16_t weapon_num = weaponnum; if (Weapons[weapon_num].sounds[WSI_FLYING] != SOUND_NONE_INDEX) Sound_system.Play3dSound(Weapons[weapon_num].sounds[WSI_FLYING], &Objects[objnum]); @@ -1104,7 +1104,7 @@ void DemoReadObjCreate() { matrix orient; vector pos; int roomnum; - short id; + int16_t id; int parent_handle; object *obj; @@ -1137,11 +1137,11 @@ void DemoReadObjCreate() { Int3(); // What is this? } - short new_objnum = ObjCreate(type, id, roomnum, &pos, use_orient ? &orient : NULL, parent_handle); + int16_t new_objnum = ObjCreate(type, id, roomnum, &pos, use_orient ? &orient : NULL, parent_handle); if (new_objnum > -1) { // DAJ -1FIX obj = &Objects[new_objnum]; - short oldobjnum = cf_ReadShort(Demo_cfp); + int16_t oldobjnum = cf_ReadShort(Demo_cfp); Demo_obj_map[oldobjnum] = new_objnum; // MSAFE needs this list too Server_object_list[oldobjnum] = new_objnum; @@ -1368,8 +1368,8 @@ void DemoReadCollidePlayerWeapon(void) { vector collision_n; bool f_reverse_normal; uint16_t real_weapnum; - short plr_objnum = cf_ReadShort(Demo_cfp); - short wep_objnum = cf_ReadShort(Demo_cfp); + int16_t plr_objnum = cf_ReadShort(Demo_cfp); + int16_t wep_objnum = cf_ReadShort(Demo_cfp); gs_ReadVector(Demo_cfp, collision_p); gs_ReadVector(Demo_cfp, collision_n); uint8_t b = cf_ReadByte(Demo_cfp); @@ -1399,8 +1399,8 @@ void DemoReadCollideGenericWeapon(void) { vector collision_n; bool f_reverse_normal; uint16_t real_weapnum; - short gen_objnum = cf_ReadShort(Demo_cfp); - short wep_objnum = cf_ReadShort(Demo_cfp); + int16_t gen_objnum = cf_ReadShort(Demo_cfp); + int16_t wep_objnum = cf_ReadShort(Demo_cfp); gs_ReadVector(Demo_cfp, collision_p); gs_ReadVector(Demo_cfp, collision_n); uint8_t b = cf_ReadByte(Demo_cfp); @@ -1470,9 +1470,9 @@ void DemoWriteAttachObjRad(object *parent, char parent_ap, object *child, float } void DemoReadAttachObjRad(void) { - short old_objnum; - short parent_num; - short child_num; + int16_t old_objnum; + int16_t parent_num; + int16_t child_num; char parent_ap; float rad; old_objnum = cf_ReadShort(Demo_cfp); @@ -1494,9 +1494,9 @@ void DemoWriteAttachObj(object *parent, char parent_ap, object *child, char chil } void DemoReadAttachObj(void) { - short old_objnum; - short parent_num; - short child_num; + int16_t old_objnum; + int16_t parent_num; + int16_t child_num; char parent_ap; char child_ap; bool f_aligned; @@ -1516,8 +1516,8 @@ void DemoWriteUnattachObj(object *child) { } void DemoReadUnattachObj(void) { - short old_objnum = cf_ReadShort(Demo_cfp); - short unattach_objnum = Demo_obj_map[old_objnum]; + int16_t old_objnum = cf_ReadShort(Demo_cfp); + int16_t unattach_objnum = Demo_obj_map[old_objnum]; UnattachFromParent(&Objects[unattach_objnum]); } @@ -1593,15 +1593,15 @@ void DemoPostPlaybackMenu(void) { // Game_paused = false; } -void DemoWriteObjWeapFireFlagChanged(short objnum) { +void DemoWriteObjWeapFireFlagChanged(int16_t objnum) { cf_WriteByte(Demo_cfp, DT_WEAP_FIRE_FLAG); cf_WriteShort(Demo_cfp, objnum); cf_WriteByte(Demo_cfp, Objects[objnum].weapon_fire_flags); } void DemoReadObjWeapFireFlagChanged(void) { - short oldobjnum = cf_ReadShort(Demo_cfp); - short newobjnum = Demo_obj_map[oldobjnum]; + int16_t oldobjnum = cf_ReadShort(Demo_cfp); + int16_t newobjnum = Demo_obj_map[oldobjnum]; Objects[newobjnum].weapon_fire_flags = cf_ReadByte(Demo_cfp); } @@ -1746,8 +1746,8 @@ void DemoWriteSetObjDead(object *obj) { } void DemoReadSetObjDead() { - short oldobjnum = cf_ReadShort(Demo_cfp); - short local_objnum = Demo_obj_map[oldobjnum]; + int16_t oldobjnum = cf_ReadShort(Demo_cfp); + int16_t local_objnum = Demo_obj_map[oldobjnum]; Objects[local_objnum].flags |= OF_SERVER_SAYS_DELETE; SetObjectDeadFlag(&Objects[local_objnum]); @@ -1868,8 +1868,8 @@ void DemoWriteObjLifeLeft(object *obj) { } void DemoReadObjLifeLeft(void) { - short oldobjnum = cf_ReadShort(Demo_cfp); - short local_objnum = Demo_obj_map[oldobjnum]; + int16_t oldobjnum = cf_ReadShort(Demo_cfp); + int16_t local_objnum = Demo_obj_map[oldobjnum]; if (cf_ReadByte(Demo_cfp)) { Objects[local_objnum].flags |= OF_USES_LIFELEFT; diff --git a/Descent3/descent.cpp b/Descent3/descent.cpp index bc1a7398..27075f19 100644 --- a/Descent3/descent.cpp +++ b/Descent3/descent.cpp @@ -442,7 +442,7 @@ void ShowStaticScreen(char *bitmap_filename, bool timed = false, float delay_tim extern int CD_inserted; char Proxy_server[200] = ""; -short Proxy_port = 80; +int16_t Proxy_port = 80; void Descent3() { int type; diff --git a/Descent3/door.h b/Descent3/door.h index 7a936e67..90faf195 100644 --- a/Descent3/door.h +++ b/Descent3/door.h @@ -126,7 +126,7 @@ typedef struct { uint8_t used; // if this door is in use uint8_t flags; // flags for this door uint8_t pad; // keep alignment (pagename is 35 chars long) - short hit_points; // for blastable doors + int16_t hit_points; // for blastable doors float total_open_time; // time of animation to open door float total_close_time; // time of animation to close door float total_time_open; // how much time to stay open diff --git a/Descent3/fireball.cpp b/Descent3/fireball.cpp index a77a8e4b..3ce0194a 100644 --- a/Descent3/fireball.cpp +++ b/Descent3/fireball.cpp @@ -1789,7 +1789,7 @@ void MakeShockwave(object *explode_obj_ptr, int parent_handle) { DoConcussiveForce(explode_obj_ptr, parent_handle); } } -// object *object_create_explosion_sub(object *explode_obj_ptr, short segnum, vms_vector * position, fix size, int +// object *object_create_explosion_sub(object *explode_obj_ptr, int16_t segnum, vms_vector * position, fix size, int // vclip_type, fix maxdamage, fix maxdistance, fix maxforce, int parent ) void DoConcussiveForce(object *explode_obj_ptr, int parent_handle, float player_scalar) { int objnum; @@ -1798,7 +1798,7 @@ void DoConcussiveForce(object *explode_obj_ptr, int parent_handle, float player_ float maxforce = explode_obj_ptr->impact_force; float maxdistance = explode_obj_ptr->impact_size; float effect_distance; - short parent; + int16_t parent; object *parent_obj; if (explode_obj_ptr->type == OBJ_SHOCKWAVE) { effect_distance = diff --git a/Descent3/fireball.h b/Descent3/fireball.h index b93bf88e..0b645113 100644 --- a/Descent3/fireball.h +++ b/Descent3/fireball.h @@ -184,7 +184,7 @@ typedef struct { uint8_t tex_size; // What size texture to use for this animation float total_life; // How long this animation should last (in seconds) float size; // How big this explosion is - short bm_handle; // The handle to the vlip + int16_t bm_handle; // The handle to the vlip } fireball; extern fireball Fireballs[]; diff --git a/Descent3/gamecinematics.cpp b/Descent3/gamecinematics.cpp index 7bfaeac4..168f1492 100644 --- a/Descent3/gamecinematics.cpp +++ b/Descent3/gamecinematics.cpp @@ -2209,13 +2209,13 @@ void Cinematic_StartCanned(tCannedCinematicInfo *info, int camera_handle) { // Demo file support //================================================== static void mf_WriteInt(uint8_t *buffer, int *pointer, int data); -static void mf_WriteShort(uint8_t *buffer, int *pointer, short data); +static void mf_WriteShort(uint8_t *buffer, int *pointer, int16_t data); static void mf_WriteByte(uint8_t *buffer, int *pointer, uint8_t data); static void mf_WriteFloat(uint8_t *buffer, int *pointer, float data); static void mf_WriteBytes(uint8_t *buffer, int *pointer, uint8_t *data, int len); static void mf_WriteString(uint8_t *buffer, int *pointer, const char *string); static int mf_ReadInt(uint8_t *buffer, int *pointer); -static short mf_ReadShort(uint8_t *buffer, int *pointer); +static int16_t mf_ReadShort(uint8_t *buffer, int *pointer); static uint8_t mf_ReadByte(uint8_t *buffer, int *pointer); static float mf_ReadFloat(uint8_t *buffer, int *pointer); static void mf_ReadBytes(uint8_t *buffer, int *pointer, uint8_t *data, int len); @@ -2415,9 +2415,9 @@ void mf_WriteInt(uint8_t *buffer, int *pointer, int data) { (*pointer) += sizeof(int); } -void mf_WriteShort(uint8_t *buffer, int *pointer, short data) { - memcpy(&buffer[(*pointer)], &data, sizeof(short)); - (*pointer) += sizeof(short); +void mf_WriteShort(uint8_t *buffer, int *pointer, int16_t data) { + memcpy(&buffer[(*pointer)], &data, sizeof(int16_t)); + (*pointer) += sizeof(int16_t); } void mf_WriteByte(uint8_t *buffer, int *pointer, uint8_t data) { @@ -2450,8 +2450,8 @@ int mf_ReadInt(uint8_t *buffer, int *pointer) { return value; } -short mf_ReadShort(uint8_t *buffer, int *pointer) { - short value; +int16_t mf_ReadShort(uint8_t *buffer, int *pointer) { + int16_t value; memcpy(&value, &buffer[(*pointer)], sizeof(value)); (*pointer) += sizeof(value); return value; diff --git a/Descent3/gamesave.cpp b/Descent3/gamesave.cpp index f90a9bd2..5cf49949 100644 --- a/Descent3/gamesave.cpp +++ b/Descent3/gamesave.cpp @@ -716,7 +716,7 @@ bool LoadCurrentSaveGame() { bool SaveGameState(const char *pathname, const char *description) { CFILE *fp; char buf[GAMESAVE_DESCLEN + 1]; - short pending_music_region; + int16_t pending_music_region; fp = cfopen(pathname, "wb"); if (!fp) @@ -748,7 +748,7 @@ bool SaveGameState(const char *pathname, const char *description) { // write out gamemode information // write out mission level information - cf_WriteShort(fp, (short)Current_mission.cur_level); + cf_WriteShort(fp, (int16_t)Current_mission.cur_level); if (Current_mission.filename && (strcmpi("d3_2.mn3", Current_mission.filename) == 0)) { cf_WriteString(fp, "d3.mn3"); @@ -838,7 +838,7 @@ bool SaveGameState(const char *pathname, const char *description) { void SGSXlateTables(CFILE *fp) { START_VERIFY_SAVEFILE(fp); // create object info translation table - short i, highest_index = -1; + int16_t i, highest_index = -1; for (i = 0; i < MAX_OBJECT_IDS; i++) if (Object_info[i].type != OBJ_NONE) @@ -883,7 +883,7 @@ extern uint8_t AutomapVisMap[MAX_ROOMS]; void SGSRooms(CFILE *fp) { int i, f, p; - gs_WriteShort(fp, (short)Highest_room_index); + gs_WriteShort(fp, (int16_t)Highest_room_index); gs_WriteShort(fp, MAX_ROOMS); @@ -951,7 +951,7 @@ void SGSEvents(CFILE *fp) {} void SGSTriggers(CFILE *fp) { int i; - gs_WriteShort(fp, (short)Num_triggers); + gs_WriteShort(fp, (int16_t)Num_triggers); for (i = 0; i < Num_triggers; i++) { gs_WriteShort(fp, Triggers[i].flags); @@ -986,7 +986,7 @@ void SGSVisEffects(CFILE *fp) { if (VisEffects[i].type != VIS_NONE) count++; - gs_WriteShort(fp, (short)count); + gs_WriteShort(fp, (int16_t)count); for (i = 0; i <= Highest_vis_effect_index; i++) { if (VisEffects[i].type != VIS_NONE) @@ -1011,14 +1011,14 @@ void SGSObjects(CFILE *fp) { // Save marker info (text) cf_WriteInt(fp, Marker_message); - cf_WriteShort(fp, (short)MAX_PLAYERS * 2); + cf_WriteShort(fp, (int16_t)MAX_PLAYERS * 2); for (i = 0; i < MAX_PLAYERS * 2; i++) { cf_WriteShort(fp, strlen(MarkerMessages[i]) + 1); cf_WriteBytes((uint8_t *)MarkerMessages[i], strlen(MarkerMessages[i]) + 1, fp); } // this method should maintain the object list as it currently stands in the level - cf_WriteShort(fp, (short)Highest_object_index); + cf_WriteShort(fp, (int16_t)Highest_object_index); // save what objects are stuck to each other cf_WriteInt(fp, MAX_OBJECTS); @@ -1093,13 +1093,13 @@ void SGSObjects(CFILE *fp) { cf_WriteBytes((uint8_t *)op->name, ii, fp); // data universal to all objects that need to be saved. - gs_WriteShort(fp, (short)op->id); + gs_WriteShort(fp, (int16_t)op->id); gs_WriteInt(fp, static_cast(op->flags)); gs_WriteByte(fp, (int8_t)op->control_type); gs_WriteByte(fp, (int8_t)op->movement_type); gs_WriteByte(fp, (int8_t)op->render_type); - gs_WriteShort(fp, (short)op->renderframe); + gs_WriteShort(fp, (int16_t)op->renderframe); gs_WriteFloat(fp, op->size); gs_WriteFloat(fp, op->shields); gs_WriteByte(fp, op->contains_type); @@ -1162,7 +1162,7 @@ void SGSObjects(CFILE *fp) { INSURE_SAVEFILE; - gs_WriteShort(fp, (short)op->position_counter); + gs_WriteShort(fp, (int16_t)op->position_counter); INSURE_SAVEFILE; @@ -1296,7 +1296,7 @@ void SGSObjSpecial(CFILE *fp, const object *op) {} void SGSSpew(CFILE *fp) { int i; - gs_WriteShort(fp, (short)spew_count); + gs_WriteShort(fp, (int16_t)spew_count); for (i = 0; i < MAX_SPEW_EFFECTS; i++) { gs_WriteByte(fp, SpewEffects[i].inuse ? true : false); if (SpewEffects[i].inuse) diff --git a/Descent3/gamesave.h b/Descent3/gamesave.h index 0dc9dfeb..8a1ffe2f 100644 --- a/Descent3/gamesave.h +++ b/Descent3/gamesave.h @@ -102,13 +102,13 @@ #define GAMESAVE_DESCLEN 31 // gamesave description maximum length. typedef struct gs_tables { - short model_handles[MAX_POLY_MODELS]; - short obji_indices[MAX_OBJECT_IDS]; - short bm_handles[MAX_BITMAPS]; - short tex_handles[MAX_TEXTURES]; - short door_handles[MAX_DOORS]; - short ship_handles[MAX_SHIPS]; - short wpn_handles[MAX_WEAPONS]; + int16_t model_handles[MAX_POLY_MODELS]; + int16_t obji_indices[MAX_OBJECT_IDS]; + int16_t bm_handles[MAX_BITMAPS]; + int16_t tex_handles[MAX_TEXTURES]; + int16_t door_handles[MAX_DOORS]; + int16_t ship_handles[MAX_SHIPS]; + int16_t wpn_handles[MAX_WEAPONS]; } gs_tables; // savegame version info. @@ -157,7 +157,7 @@ int LoadGameState(const char *pathname); gs_WriteVector((_f), (_m).uvec); \ gs_WriteVector((_f), (_m).fvec); \ } while (0) -#define gs_WriteAngle(_f, _a) cf_WriteShort(_f, (short)(_a)) +#define gs_WriteAngle(_f, _a) cf_WriteShort(_f, (int16_t)(_a)) #define gs_WriteByte(_f, _b) cf_WriteByte(_f, _b) #define gs_WriteShort(_f, _s) cf_WriteShort(_f, _s) #define gs_WriteInt(_f, _i) cf_WriteInt(_f, _i) diff --git a/Descent3/gamesequence.cpp b/Descent3/gamesequence.cpp index e617da1a..3edb5680 100644 --- a/Descent3/gamesequence.cpp +++ b/Descent3/gamesequence.cpp @@ -2249,7 +2249,7 @@ bool PageInSound(int id) { if (Dedicated_server) return false; - // sometimes, id passed was 0xffff which seems like a short -1. The if statement + // sometimes, id passed was 0xffff which seems like a int16_t -1. The if statement // ensures that the array Sounds_to_free is dealt with properly. if (Sound_system.CheckAndForceSoundDataAlloc(id)) { Sounds_to_free[id] = 1; diff --git a/Descent3/gametexture.h b/Descent3/gametexture.h index 547eb14f..64fc7a76 100644 --- a/Descent3/gametexture.h +++ b/Descent3/gametexture.h @@ -260,10 +260,10 @@ typedef struct { } static_proc_element; typedef struct { - short dynamic_proc_elements; // list of dynamic procedural texture elements + int16_t dynamic_proc_elements; // list of dynamic procedural texture elements void *proc1; // pointer for procedural page void *proc2; // back page of procedural - short procedural_bitmap; // handle to the bitmap holding the finished procedural + int16_t procedural_bitmap; // handle to the bitmap holding the finished procedural uint16_t *palette; static_proc_element *static_proc_elements; @@ -302,7 +302,7 @@ typedef struct { int sound; // The sound this texture makes float sound_volume; // The volume for this texture's sound - short bumpmap; // The bumpmap for this texture, or -1 if there is none + int16_t bumpmap; // The bumpmap for this texture, or -1 if there is none uint8_t corona_type; // what type of corona this thing uses uint8_t used; // is this texture free to be allocated? diff --git a/Descent3/hotspotmap.cpp b/Descent3/hotspotmap.cpp index d1ae8563..59579838 100644 --- a/Descent3/hotspotmap.cpp +++ b/Descent3/hotspotmap.cpp @@ -802,14 +802,14 @@ void menutga_LoadHotSpotMap(int back_bmp, const char *filename, hotspotmap_t *hs void makecorner(int corner_bmp, int back_bmp, const char *tmap, int l, int t, int r, int b) { int real_x, real_y, awidth, ax, ay; - short *backdata, *cornerdata; + int16_t *backdata, *cornerdata; int back_rowsize, corner_rowsize; awidth = r - l; bm_ClearBitmap(corner_bmp); - backdata = (short *)bm_data(back_bmp, 0); + backdata = (int16_t *)bm_data(back_bmp, 0); back_rowsize = bm_rowsize(back_bmp, 0); - cornerdata = (short *)bm_data(corner_bmp, 0); + cornerdata = (int16_t *)bm_data(corner_bmp, 0); corner_rowsize = bm_rowsize(corner_bmp, 0); backdata += (t * (back_rowsize / 2)); diff --git a/Descent3/hud.cpp b/Descent3/hud.cpp index 3ad7dcca..3f0dbf5e 100644 --- a/Descent3/hud.cpp +++ b/Descent3/hud.cpp @@ -465,7 +465,7 @@ float Hud_aspect_y = 1.0f; bool Small_hud_flag = false; // changes how hud items are drawn in small huds. // used by reticle system. -static short Ret_x_off, Ret_y_off; +static int16_t Ret_x_off, Ret_y_off; static char Reticle_prefix[PSFILENAME_LEN + 1]; // Hud mode of display @@ -933,24 +933,24 @@ void SGSHudState(CFILE *fp) { huditem = &HUD_array[i]; if (huditem->stat) { if (huditem->type == HUD_ITEM_CUSTOMTEXT2) { - cf_WriteShort(fp, (short)huditem->stat); + cf_WriteShort(fp, (int16_t)huditem->stat); cf_WriteByte(fp, (int8_t)huditem->type); cf_WriteShort(fp, huditem->x); cf_WriteShort(fp, huditem->y); cf_WriteInt(fp, huditem->color); - cf_WriteShort(fp, (short)huditem->flags); + cf_WriteShort(fp, (int16_t)huditem->flags); cf_WriteByte(fp, (int8_t)huditem->alpha); - cf_WriteShort(fp, (short)huditem->buffer_size); + cf_WriteShort(fp, (int16_t)huditem->buffer_size); cf_WriteString(fp, huditem->data.text); mprintf((0, "sg: saved customtext2 (%x,%x,bufsize=%d)\n", huditem->x, huditem->y, huditem->buffer_size)); } else if (huditem->type == HUD_ITEM_TIMER) { - cf_WriteShort(fp, (short)huditem->stat); + cf_WriteShort(fp, (int16_t)huditem->stat); cf_WriteByte(fp, (int8_t)huditem->type); cf_WriteShort(fp, huditem->x); cf_WriteShort(fp, huditem->y); cf_WriteInt(fp, huditem->color); - cf_WriteShort(fp, (short)huditem->flags); + cf_WriteShort(fp, (int16_t)huditem->flags); cf_WriteByte(fp, (int8_t)huditem->alpha); cf_WriteInt(fp, huditem->data.timer_handle); @@ -958,12 +958,12 @@ void SGSHudState(CFILE *fp) { } else if (huditem->type == HUD_ITEM_CUSTOMTEXT) { // commented out because persistent hud messages are custom text, and its a mess to save the current // state of hud persistent messages. - // cf_WriteShort(fp, (short)huditem->stat); + // cf_WriteShort(fp, (int16_t)huditem->stat); // cf_WriteByte(fp, (int8_t)huditem->type); // cf_WriteShort(fp, huditem->x); // cf_WriteShort(fp, huditem->y); // cf_WriteInt(fp, huditem->color); - // cf_WriteShort(fp, (short)huditem->flags); + // cf_WriteShort(fp, (int16_t)huditem->flags); // cf_WriteByte(fp, (int8_t)huditem->alpha); // // cf_WriteString(fp, huditem->data.timer_handle); @@ -1176,8 +1176,8 @@ void LoadHUDConfig(const char *filename, bool (*fn)(const char *, const char *, } else if (!strcmpi(command, "reticleoffset")) { int x, y; sscanf(operand, "%d,%d", &x, &y); - Ret_x_off = (short)x; - Ret_y_off = (short)y; + Ret_x_off = (int16_t)x; + Ret_y_off = (int16_t)y; } else if (fn && (*fn)(command, operand, ext_data)) { continue; } else { diff --git a/Descent3/hud.h b/Descent3/hud.h index 32d85350..bb37d560 100644 --- a/Descent3/hud.h +++ b/Descent3/hud.h @@ -454,10 +454,10 @@ const char *GetMessageDestination(const char *message, int *destination); typedef struct t_dirty_rect { struct { - short l, t, r, b; + int16_t l, t, r, b; } r[3]; // three rectangles for each frame buffer (3 max) - void set(short l0, short t0, short r0, short b0) { + void set(int16_t l0, int16_t t0, int16_t r0, int16_t b0) { r[0].l = l0; r[0].t = t0; r[0].r = r0; @@ -468,10 +468,10 @@ typedef struct t_dirty_rect { } tDirtyRect; // dirty rectangle for hud item (small hud version) typedef struct tHUDItem { - short x, y; - short xa, ya; // auxillary points - short xb, yb; - short tx, ty; // text version x and y. + int16_t x, y; + int16_t xa, ya; // auxillary points + int16_t xb, yb; + int16_t tx, ty; // text version x and y. float grscalex, grscaley; // used to scale graphics. uint8_t id; // id number. diff --git a/Descent3/hudmessage.cpp b/Descent3/hudmessage.cpp index 233e8079..5d5db83e 100644 --- a/Descent3/hudmessage.cpp +++ b/Descent3/hudmessage.cpp @@ -1079,7 +1079,7 @@ void RenderScrollingHUDMessages() { int shade; int text_height; - short l, t, r, b; + int16_t l, t, r, b; int i; // Check for wraps @@ -1220,10 +1220,10 @@ void RenderHUDMessages() { if (item && Small_hud_flag) { grtext_SetFont(HUD_FONT); - short l = item->x * Max_window_w / DEFAULT_HUD_WIDTH; - short t = item->y * Max_window_h / DEFAULT_HUD_HEIGHT; - short r = l + grtext_GetTextLineWidth(item->data.text) + 10; - short b = t + grtext_GetTextHeight(item->data.text); + int16_t l = item->x * Max_window_w / DEFAULT_HUD_WIDTH; + int16_t t = item->y * Max_window_h / DEFAULT_HUD_HEIGHT; + int16_t r = l + grtext_GetTextLineWidth(item->data.text) + 10; + int16_t b = t + grtext_GetTextHeight(item->data.text); item->dirty_rect.set(l, t, r, b); } @@ -1493,7 +1493,7 @@ void SGSGameMessages(CFILE *fp) { int i = 0; const char *msg; - cf_WriteShort(fp, (short)Game_msg_list.m_nmsg); + cf_WriteShort(fp, (int16_t)Game_msg_list.m_nmsg); while ((msg = Game_msg_list.get(i++)) != NULL) { cf_WriteString(fp, msg); diff --git a/Descent3/levelgoal.cpp b/Descent3/levelgoal.cpp index 61d08f09..c4f4ba05 100644 --- a/Descent3/levelgoal.cpp +++ b/Descent3/levelgoal.cpp @@ -827,7 +827,7 @@ bool levelgoals::LoadLevelGoalInfo(CFILE *fptr) { CleanupAfterLevel(); int i; - short version = cf_ReadShort(fptr); + int16_t version = cf_ReadShort(fptr); int num_goals = cf_ReadShort(fptr); for (i = 0; i < num_goals; i++) { diff --git a/Descent3/lighting.cpp b/Descent3/lighting.cpp index 4f5fda83..087f0c3b 100644 --- a/Descent3/lighting.cpp +++ b/Descent3/lighting.cpp @@ -992,7 +992,7 @@ void ApplyVolumeLightToObject(vector *pos, object *obj, float light_dist, float // Applies lighting to all objects in a certain distance void ApplyLightingToObjects(vector *pos, int roomnum, float light_dist, float red_scale, float green_scale, float blue_scale, vector *light_direction, float dot_range) { - short objlist[MAX_DYNAMIC_FACES]; + int16_t objlist[MAX_DYNAMIC_FACES]; int num_objects, i; float normalized_time[MAX_SUBOBJECTS]; diff --git a/Descent3/lightmap_info.h b/Descent3/lightmap_info.h index 7a014f89..285c26bc 100644 --- a/Descent3/lightmap_info.h +++ b/Descent3/lightmap_info.h @@ -62,7 +62,7 @@ typedef struct { uint8_t used; uint16_t dynamic; - short spec_map; + int16_t spec_map; uint8_t type; // see LMI_types above } lightmap_info; diff --git a/Descent3/loadstate.cpp b/Descent3/loadstate.cpp index 07dbc4b1..7da6c2b9 100644 --- a/Descent3/loadstate.cpp +++ b/Descent3/loadstate.cpp @@ -268,7 +268,7 @@ int LoadGameState(const char *pathname) { char path[PSPATHNAME_LEN]; uint16_t version; uint16_t curlevel; - short pending_music_region; + int16_t pending_music_region; IsRestoredGame = true; // load in stuff fp = cfopen(pathname, "rb"); @@ -474,7 +474,7 @@ savesg_error: int LGSXlateTables(CFILE *fp) { START_VERIFY_SAVEFILE(fp); int retval = LGS_OK; - short i, num, index; + int16_t i, num, index; char name[64]; // load object info translation table @@ -541,15 +541,15 @@ extern uint8_t AutomapVisMap[MAX_ROOMS]; // initializes rooms int LGSRooms(CFILE *fp) { int retval = LGS_OK; - short i, p, highest_index; + int16_t i, p, highest_index; gs_ReadShort(fp, highest_index); - if (highest_index != (short)Highest_room_index) { + if (highest_index != (int16_t)Highest_room_index) { Int3(); return LGS_CORRUPTLEVEL; } - short num_rooms; + int16_t num_rooms; gs_ReadShort(fp, num_rooms); for (i = 0; i < num_rooms; i++) { @@ -628,10 +628,10 @@ int LGSEvents(CFILE *fp) { // loads in and sets these triggers int LGSTriggers(CFILE *fp) { - short i, n_trigs = 0; + int16_t i, n_trigs = 0; gs_ReadShort(fp, n_trigs); - if (n_trigs != (short)Num_triggers) { + if (n_trigs != (int16_t)Num_triggers) { Int3(); return LGS_CORRUPTLEVEL; } @@ -686,7 +686,7 @@ typedef struct { uint16_t flags; int phys_flags; uint8_t movement_type; - short custom_handle; + int16_t custom_handle; uint16_t lighting_color; vis_attach_info attach_info; @@ -694,8 +694,8 @@ typedef struct { vector end_pos; - short next; - short prev; + int16_t next; + int16_t prev; } old_vis_effect; void CopyVisStruct(vis_effect *vis, old_vis_effect *old_vis) { @@ -733,7 +733,7 @@ void CopyVisStruct(vis_effect *vis, old_vis_effect *old_vis) { // save viseffects int LGSVisEffects(CFILE *fp) { - short i, count = 0; + int16_t i, count = 0; gs_ReadShort(fp, count); @@ -778,7 +778,7 @@ int LGSVisEffects(CFILE *fp) { // players int LGSPlayers(CFILE *fp) { player *plr = &Players[0]; - short size; + int16_t size; // must do this if we read player struct as whole. plr->inventory.Reset(false, INVRESET_ALL); @@ -953,7 +953,7 @@ int LGSObjects(CFILE *fp, int version) { door *door; int index, nattach, new_model, handle; uint8_t type, dummy_type; - short sindex, size; + int16_t sindex, size; // if((i==98)||(i==100)) // Int3(); @@ -1242,7 +1242,7 @@ int LGSObjects(CFILE *fp, int version) { case RT_POLYOBJ: // be sure to use translated handles for polyobjs and textures { // the paging mess. must update size of object accordingly. - sindex = (short)op->rtype.pobj_info.model_num; + sindex = (int16_t)op->rtype.pobj_info.model_num; new_model = (sindex > -1) ? gs_Xlates->model_handles[sindex] : -1; if ((new_model != op->rtype.pobj_info.model_num) || (Poly_models[new_model].flags & PMF_NOT_RESIDENT)) { switch (type) { @@ -1275,7 +1275,7 @@ int LGSObjects(CFILE *fp, int version) { } op->rtype.pobj_info.model_num = new_model; - sindex = (short)op->rtype.pobj_info.dying_model_num; + sindex = (int16_t)op->rtype.pobj_info.dying_model_num; new_model = (sindex > -1) ? gs_Xlates->model_handles[sindex] : -1; if (new_model != op->rtype.pobj_info.dying_model_num) { switch (type) { @@ -1323,7 +1323,7 @@ int LGSObjects(CFILE *fp, int version) { } case RT_SHARD: - sindex = (short)op->rtype.shard_info.tmap; + sindex = (int16_t)op->rtype.shard_info.tmap; op->rtype.shard_info.tmap = (sindex > -1) ? gs_Xlates->tex_handles[sindex] : -1; break; @@ -1441,7 +1441,7 @@ done:; // loads ai int LGSObjAI(CFILE *fp, ai_frame **pai) { ai_frame *ai; - short size; + int16_t size; int8_t read_ai; *pai = NULL; @@ -1464,7 +1464,7 @@ int LGSObjAI(CFILE *fp, ai_frame **pai) { // loads fx int LGSObjEffects(CFILE *fp, object *op) { - short size; + int16_t size; int8_t do_read; op->effect_info = NULL; @@ -1610,7 +1610,7 @@ int LGSSnapshot(CFILE *fp) { //@@ { //@@ case MT_SHOCKWAVE: //@@ { -//@@ short bound; +//@@ int16_t bound; //@@ gs_ReadShort(fp, bound); //@@ if (bound < (sizeof(op_wave->damaged_list)/sizeof(uint32_t))) { //@@ Int3(); diff --git a/Descent3/matcen.cpp b/Descent3/matcen.cpp index df5dc77b..7bfcf6c5 100644 --- a/Descent3/matcen.cpp +++ b/Descent3/matcen.cpp @@ -843,14 +843,14 @@ void matcen::SaveData(CFILE *fp) { cf_WriteInt(fp, m_sound_active_handle); } -extern short texture_xlate[]; +extern int16_t texture_xlate[]; void matcen::LoadData(CFILE *fp) { int i, j; int len; - short max_spawn_pnts; - short max_prod_types; - short max_matcen_sounds; + int16_t max_spawn_pnts; + int16_t max_prod_types; + int16_t max_matcen_sounds; int version = cf_ReadInt(fp); @@ -1721,9 +1721,9 @@ bool matcen::SetCreationEffect(char effect_index) { return true; } -void matcen::SetCreationTexture(short texnum) { m_creation_texture = texnum; } +void matcen::SetCreationTexture(int16_t texnum) { m_creation_texture = texnum; } -short matcen::GetCreationTexture() { return m_creation_texture; } +int16_t matcen::GetCreationTexture() { return m_creation_texture; } int matcen::GetSound(char sound_type) { if (sound_type >= 0 && sound_type < MAX_MATCEN_SOUNDS) { diff --git a/Descent3/matcen.h b/Descent3/matcen.h index ae3f54c1..4f0b6723 100644 --- a/Descent3/matcen.h +++ b/Descent3/matcen.h @@ -61,7 +61,7 @@ private: char m_control_type; char m_type; char m_creation_effect; - short m_creation_texture; + int16_t m_creation_texture; uint8_t m_cur_saturation_count; int m_num_spawn_pnts; @@ -77,7 +77,7 @@ private: int m_spawn_pnt[MAX_SPAWN_PNTS]; vector m_spawn_vec[MAX_SPAWN_PNTS]; vector m_spawn_normal[MAX_SPAWN_PNTS]; - short m_spawn_vis_effects[MAX_MATCEN_EFFECT_SATURATION][MAX_SPAWN_PNTS]; + int16_t m_spawn_vis_effects[MAX_MATCEN_EFFECT_SATURATION][MAX_SPAWN_PNTS]; int m_max_prod; @@ -86,8 +86,8 @@ private: int m_prod_priority[MAX_PROD_TYPES]; int m_max_prod_type[MAX_PROD_TYPES]; - short m_max_alive_children; - short m_num_alive; + int16_t m_max_alive_children; + int16_t m_num_alive; int *m_alive_list; // list of alive children float m_preprod_time; @@ -135,8 +135,8 @@ public: matcen(); ~matcen(); - void SetCreationTexture(short texnum); - short GetCreationTexture(); + void SetCreationTexture(int16_t texnum); + int16_t GetCreationTexture(); char GetAttachType(); bool SetAttachType(char type); diff --git a/Descent3/mission_download.cpp b/Descent3/mission_download.cpp index c6f509b8..09c14b8d 100644 --- a/Descent3/mission_download.cpp +++ b/Descent3/mission_download.cpp @@ -144,7 +144,7 @@ msn_urls msn_URL = {"", {"", "", "", "", ""}}; msn_urls Net_msn_URLs; extern char Proxy_server[200]; -extern short Proxy_port; +extern int16_t Proxy_port; int msn_ExtractZipFile(char *zipfilename, char *mn3name); diff --git a/Descent3/mmItem.h b/Descent3/mmItem.h index 23d28fa9..8f334d3a 100644 --- a/Descent3/mmItem.h +++ b/Descent3/mmItem.h @@ -109,13 +109,13 @@ void MenuScene(); // display menu scene class tmmItemQueue { #define tmmItemSIZE 8 tmmItemFX m_items[tmmItemSIZE]; - short m_head, m_tail; + int16_t m_head, m_tail; public: tmmItemQueue() { m_head = m_tail = 0; }; ~tmmItemQueue(){}; void send(tmmItemFX &item) { // sends an item onto the queue - short temp = m_tail + 1; + int16_t temp = m_tail + 1; if (temp == tmmItemSIZE) temp = 0; if (temp != m_head) { @@ -141,8 +141,8 @@ class mmInterface; // class mmItem class mmItem : public UIGadget { char *m_text; // text for item - short m_alpha; // alpha for text item - short m_satcount; + int16_t m_alpha; // alpha for text item + int16_t m_satcount; tmmItemFX m_curfx; // current effect #ifndef __LINUX__ tQueue m_fxqueue; // special effects queue diff --git a/Descent3/multi.cpp b/Descent3/multi.cpp index 2288a9ce..4acb622d 100644 --- a/Descent3/multi.cpp +++ b/Descent3/multi.cpp @@ -1792,8 +1792,8 @@ char Tracker_id[TRACKER_ID_LEN]; vmt_descent3_struct MTPilotinfo[MAX_NET_PLAYERS]; -short Multi_kills[MAX_NET_PLAYERS]; -short Multi_deaths[MAX_NET_PLAYERS]; +int16_t Multi_kills[MAX_NET_PLAYERS]; +int16_t Multi_deaths[MAX_NET_PLAYERS]; int Got_new_game_time = 0; @@ -1827,7 +1827,7 @@ void SendDataChunk(int playernum); void DenyFile(int playernum, int filenum, int file_who); void MultiDoFileCancelled(uint8_t *data); void MultiDoCustomPlayerData(uint8_t *data); -char *GetFileNameFromPlayerAndID(short playernum, short id); +char *GetFileNameFromPlayerAndID(int16_t playernum, int16_t id); // Multiplayer position flags #define MPF_AFTERBURNER 1 // Afterburner is on @@ -4211,7 +4211,7 @@ void MultiDoWorldStates(uint8_t *data) { case WS_ROOM_WIND: { // Room wind - short roomnum = MultiGetShort(data, &count); + int16_t roomnum = MultiGetShort(data, &count); Rooms[roomnum].wind.x = MultiGetFloat(data, &count); Rooms[roomnum].wind.y = MultiGetFloat(data, &count); Rooms[roomnum].wind.z = MultiGetFloat(data, &count); @@ -4222,7 +4222,7 @@ void MultiDoWorldStates(uint8_t *data) { } case WS_ROOM_FOG: { // Room wind - short roomnum = MultiGetShort(data, &count); + int16_t roomnum = MultiGetShort(data, &count); Rooms[roomnum].fog_depth = MultiGetFloat(data, &count); Rooms[roomnum].fog_r = ((float)MultiGetUbyte(data, &count)) / 255.0; Rooms[roomnum].fog_g = ((float)MultiGetUbyte(data, &count)) / 255.0; @@ -4239,7 +4239,7 @@ void MultiDoWorldStates(uint8_t *data) { case WS_ROOM_LIGHTING: { // Room lighting uint8_t state; - short roomnum = MultiGetShort(data, &count); + int16_t roomnum = MultiGetShort(data, &count); Rooms[roomnum].pulse_time = MultiGetUbyte(data, &count); Rooms[roomnum].pulse_offset = MultiGetUbyte(data, &count); state = MultiGetUbyte(data, &count); @@ -4258,7 +4258,7 @@ void MultiDoWorldStates(uint8_t *data) { } case WS_ROOM_REFUEL: { // Room fueling - short roomnum = MultiGetShort(data, &count); + int16_t roomnum = MultiGetShort(data, &count); uint8_t state = MultiGetUbyte(data, &count); if (state) Rooms[roomnum].flags |= RF_FUELCEN; @@ -4268,43 +4268,43 @@ void MultiDoWorldStates(uint8_t *data) { break; } case WS_ROOM_TEXTURE: { - short roomnum = MultiGetShort(data, &count); - short facenum = MultiGetShort(data, &count); + int16_t roomnum = MultiGetShort(data, &count); + int16_t facenum = MultiGetShort(data, &count); char str[255]; MultiGetString(str, data, &count); ChangeRoomFaceTexture(roomnum, facenum, FindTextureName(IGNORE_TABLE(str))); break; } case WS_ROOM_GLASS: { - short roomnum = MultiGetShort(data, &count); - short facenum = MultiGetShort(data, &count); + int16_t roomnum = MultiGetShort(data, &count); + int16_t facenum = MultiGetShort(data, &count); BreakGlassFace(&Rooms[roomnum], facenum); break; } case WS_ROOM_PORTAL_RENDER: { - short roomnum = MultiGetShort(data, &count); - short portalnum = MultiGetShort(data, &count); + int16_t roomnum = MultiGetShort(data, &count); + int16_t portalnum = MultiGetShort(data, &count); uint8_t flags = MultiGetByte(data, &count); Rooms[roomnum].portals[portalnum].flags = flags; break; } case WS_ROOM_PORTAL_BLOCK: { - short roomnum = MultiGetShort(data, &count); - short portalnum = MultiGetShort(data, &count); + int16_t roomnum = MultiGetShort(data, &count); + int16_t portalnum = MultiGetShort(data, &count); uint8_t flags = MultiGetByte(data, &count); Rooms[roomnum].portals[portalnum].flags = flags; break; } case WS_ROOM_DAMAGE: { // Room wind - short roomnum = MultiGetShort(data, &count); + int16_t roomnum = MultiGetShort(data, &count); Rooms[roomnum].damage = MultiGetFloat(data, &count); Rooms[roomnum].damage_type = MultiGetUbyte(data, &count); break; } case WS_ROOM_GOALSPECFLAG: { // goals & special flags - short roomnum = MultiGetShort(data, &count); + int16_t roomnum = MultiGetShort(data, &count); int mask = (RF_SPECIAL1 | RF_SPECIAL2 | RF_SPECIAL3 | RF_SPECIAL4 | RF_SPECIAL5 | RF_SPECIAL6 | RF_GOAL1 | RF_GOAL2 | RF_GOAL3 | RF_GOAL4); int change_mask = MultiGetInt(data, &count); @@ -5065,8 +5065,8 @@ void MultiDoExecuteDLL(uint8_t *data) { SKIP_HEADER(data, &count); uint16_t eventnum = MultiGetShort(data, &count); - short me_objnum = MultiGetShort(data, &count); - short it_objnum = MultiGetShort(data, &count); + int16_t me_objnum = MultiGetShort(data, &count); + int16_t it_objnum = MultiGetShort(data, &count); if (MultiGetByte(data, &count)) { // we need to extract out parameters @@ -5106,8 +5106,8 @@ void MultiDoExecuteDLL(uint8_t *data) { } } - short local_me_objnum; - short local_it_objnum; + int16_t local_me_objnum; + int16_t local_it_objnum; if (me_objnum == -1) local_me_objnum = -1; @@ -6100,7 +6100,7 @@ void MultiDoRequestCountermeasure(uint8_t *data) { } // We're asking the server to create a countermeasure for us -void MultiSendRequestCountermeasure(short objnum, int weapon_index) { +void MultiSendRequestCountermeasure(int16_t objnum, int weapon_index) { int count = 0; uint8_t data[MAX_GAME_DATA_SIZE]; int size_offset; @@ -6735,7 +6735,7 @@ void MultiPaintGoalRooms(int *texcolors) { } } -void MultiSendKillObject(object *hit_obj, object *killer, float damage, int death_flags, float delay, short seed) { +void MultiSendKillObject(object *hit_obj, object *killer, float damage, int death_flags, float delay, int16_t seed) { int size; int count = 0; uint8_t data[MAX_GAME_DATA_SIZE]; @@ -6954,7 +6954,7 @@ void MultiDoObjAnimUpdate(uint8_t *data) { void MultiDoPlay3dSound(uint8_t *data) { int objnum; - short soundidx; + int16_t soundidx; int count = 0; MULTI_ASSERT_NOMESSAGE(Netgame.local_role != LR_SERVER); @@ -6974,7 +6974,7 @@ void MultiDoPlay3dSound(uint8_t *data) { Sound_system.Play3dSound(soundidx, &Objects[objnum], priority); } -void MultiPlay3dSound(short soundidx, uint16_t objnum, int priority) { +void MultiPlay3dSound(int16_t soundidx, uint16_t objnum, int priority) { uint8_t data[MAX_GAME_DATA_SIZE]; int count = 0; int size = 0; @@ -7003,7 +7003,7 @@ void MultiPlay3dSound(short soundidx, uint16_t objnum, int priority) { } } -void MultiSendRobotFireSound(short soundidx, uint16_t objnum) { +void MultiSendRobotFireSound(int16_t soundidx, uint16_t objnum) { int size; int count = 0; uint8_t data[MAX_GAME_DATA_SIZE]; @@ -7039,7 +7039,7 @@ void MultiSendRobotFireSound(short soundidx, uint16_t objnum) { void MultiDoRobotFireSound(uint8_t *data) { int objnum; - short soundidx; + int16_t soundidx; int count = 0; MULTI_ASSERT_NOMESSAGE(Netgame.local_role != LR_SERVER); SKIP_HEADER(data, &count); @@ -8040,14 +8040,14 @@ void MultiDoCustomPlayerData(uint8_t *data) { return; mprintf((0, "Got custom data in MultiDoCustomPlayerData()\n")); NetPlayers[playernum].custom_file_seq = NETFILE_ID_SHIP_TEX; // First in the sequence of files we will request - short logo_len = MultiGetUshort(data, &count); + int16_t logo_len = MultiGetUshort(data, &count); memcpy(NetPlayers[playernum].ship_logo, data + count, logo_len); count += logo_len; mprintf((0, "%s uses custom ship logo %s\n", Players[playernum].callsign, NetPlayers[playernum].ship_logo)); for (int t = 0; t < 4; t++) { char *filename; - short vt_len; + int16_t vt_len; switch (t) { case 0: @@ -8070,7 +8070,7 @@ void MultiDoCustomPlayerData(uint8_t *data) { } } -char *GetFileNameFromPlayerAndID(short playernum, short id) { +char *GetFileNameFromPlayerAndID(int16_t playernum, int16_t id) { static char rval[_MAX_PATH * 2]; rval[0] = '\0'; @@ -8423,7 +8423,7 @@ void MultiDoAiWeaponFlags(uint8_t *data) { int flags; int wb_index; - short obj_num = Server_object_list[MultiGetUshort(data, &count)]; + int16_t obj_num = Server_object_list[MultiGetUshort(data, &count)]; flags = MultiGetInt(data, &count); wb_index = MultiGetByte(data, &count); if (obj_num == 65535) { @@ -9950,7 +9950,7 @@ void MultiProcessData(uint8_t *data, int len, int slot, network_address *from_ad // and pass them to multi_process_data. void MultiProcessBigData(uint8_t *buf, int len, network_address *from_addr) { int type, bytes_processed = 0; - short sub_len; + int16_t sub_len; int slot = 0; int last_type = -1, last_len = -1; @@ -9978,7 +9978,7 @@ void MultiProcessBigData(uint8_t *buf, int len, network_address *from_addr) { while (bytes_processed < len) { type = buf[bytes_processed]; - sub_len = INTEL_SHORT((*(short *)(buf + bytes_processed + 1))); + sub_len = INTEL_SHORT((*(int16_t *)(buf + bytes_processed + 1))); if (sub_len < 3 || type == 0 || (len - bytes_processed) < 2) { mprintf((0, "Got a corrupted packet!\n")); @@ -9988,7 +9988,7 @@ void MultiProcessBigData(uint8_t *buf, int len, network_address *from_addr) { if ((bytes_processed + sub_len) > len) { mprintf( - (1, "multi_process_bigdata: packet type %d too short (%d>%d)!\n", type, (bytes_processed + sub_len), len)); + (1, "multi_process_bigdata: packet type %d too int16_t (%d>%d)!\n", type, (bytes_processed + sub_len), len)); Int3(); return; } diff --git a/Descent3/multi.h b/Descent3/multi.h index 864351e0..2fd24695 100644 --- a/Descent3/multi.h +++ b/Descent3/multi.h @@ -698,7 +698,7 @@ extern uint16_t Server_spew_list[]; // A semi-compressed orientation matrix for multiplayer games typedef struct { - short multi_matrix[9]; + int16_t multi_matrix[9]; } multi_orientation; static inline void MultiMatrixMakeEndianFriendly(multi_orientation *mmat) { @@ -725,7 +725,7 @@ typedef struct { int objnum; int roomnum; uint8_t used; - short original_id; + int16_t original_id; } powerup_respawn; typedef struct { @@ -1001,7 +1001,7 @@ void MultiDoRobotPos(uint8_t *data); int MultiSendRobotFireWeapon(uint16_t objectnum, vector *pos, vector *dir, uint16_t weaponnum); // Send robot damage -void MultiSendKillObject(object *hit_obj, object *killer, float damage, int death_flags, float delay, short seed); +void MultiSendKillObject(object *hit_obj, object *killer, float damage, int death_flags, float delay, int16_t seed); // handle robot damage void MultiDoRobotExplode(uint8_t *data); @@ -1019,7 +1019,7 @@ void MultiSendOnOff(object *obj, uint8_t on, uint8_t wb_index, uint8_t fire_mask void MultiSendAdditionalDamage(int slot, int type, float amount); // We're asking the server to create a countermeasure for us -void MultiSendRequestCountermeasure(short objnum, int weapon_index); +void MultiSendRequestCountermeasure(int16_t objnum, int weapon_index); // Tell the client that an object took damage void MultiSendDamageObject(object *hit_obj, object *killer, float damage, int weaponid); @@ -1040,10 +1040,10 @@ void MultiDoObjAnimUpdate(uint8_t *data); void MultiDoPlay3dSound(uint8_t *data); // Tell the clients to play a 3d sound -void MultiPlay3dSound(short soundidx, uint16_t objnum, int priority); +void MultiPlay3dSound(int16_t soundidx, uint16_t objnum, int priority); // Tell the client to play a sound because a robot fired -void MultiSendRobotFireSound(short soundidx, uint16_t objnum); +void MultiSendRobotFireSound(int16_t soundidx, uint16_t objnum); // Play the robot sound that the server told us about void MultiDoRobotFireSound(uint8_t *data); diff --git a/Descent3/multi_client.cpp b/Descent3/multi_client.cpp index e4ac30b8..21d46bd5 100644 --- a/Descent3/multi_client.cpp +++ b/Descent3/multi_client.cpp @@ -86,7 +86,7 @@ * added auto pps * * 39 12/08/98 4:52p Jeff - * changed the pilot pics packing to use Ushort instead of short just for + * changed the pilot pics packing to use Ushort instead of int16_t just for * my conscience...removed some annoying mprintf's too * * 38 12/01/98 5:48p Jeff diff --git a/Descent3/multi_dll_mgr.cpp b/Descent3/multi_dll_mgr.cpp index 614e3669..70c03e79 100644 --- a/Descent3/multi_dll_mgr.cpp +++ b/Descent3/multi_dll_mgr.cpp @@ -1006,8 +1006,8 @@ typedef struct player_killed { typedef struct player_score_matrix { int num_players; char name[MAX_NET_PLAYERS][CALLSIGN_LEN + 1]; - short deaths[MAX_NET_PLAYERS]; - short kills[MAX_NET_PLAYERS]; + int16_t deaths[MAX_NET_PLAYERS]; + int16_t kills[MAX_NET_PLAYERS]; } player_score_matrix; // The chokepoint function to call the dll function void CallMultiScoreDLL(int eventnum, void *data) { diff --git a/Descent3/multi_external.h b/Descent3/multi_external.h index 9bb1804c..e34b6e24 100644 --- a/Descent3/multi_external.h +++ b/Descent3/multi_external.h @@ -282,9 +282,9 @@ inline void MultiAddSbyte(int8_t element, uint8_t *data, int *count) { *count += sizeof(int8_t); } -inline void MultiAddShort(short element, uint8_t *data, int *count) { - *(short *)(data + *count) = INTEL_SHORT(element); - *count += sizeof(short); +inline void MultiAddShort(int16_t element, uint8_t *data, int *count) { + *(int16_t *)(data + *count) = INTEL_SHORT(element); + *count += sizeof(int16_t); } inline void MultiAddUshort(uint16_t element, uint8_t *data, int *count) { @@ -334,15 +334,15 @@ inline int8_t MultiGetSbyte(uint8_t *data, int *count) { return element; } -inline short MultiGetShort(uint8_t *data, int *count) { - short element = (*(short *)(data + *count)); - *count += sizeof(short); +inline int16_t MultiGetShort(uint8_t *data, int *count) { + int16_t element = (*(int16_t *)(data + *count)); + *count += sizeof(int16_t); return INTEL_SHORT(element); } inline uint16_t MultiGetUshort(uint8_t *data, int *count) { uint16_t element = (*(uint16_t *)(data + *count)); - *count += sizeof(short); + *count += sizeof(int16_t); return INTEL_SHORT(element); } diff --git a/Descent3/newui_core.cpp b/Descent3/newui_core.cpp index 98458f19..a43f3364 100644 --- a/Descent3/newui_core.cpp +++ b/Descent3/newui_core.cpp @@ -379,8 +379,8 @@ class newuiResources { int bm_handle; chunked_bitmap chunk; }; - short chunked; // is it a bitmap handle or chunk - short n_count; + int16_t chunked; // is it a bitmap handle or chunk + int16_t n_count; char *filename; // filename of bitmap. } m_list[N_NEWUI_BMPS_TOTAL]; // list of bitmaps. @@ -406,7 +406,7 @@ class newuiCheckBox : public newuiButton, public UICheckBox { public: newuiCheckBox(); - void Create(UIWindow *wnd, short id, const char *name, short x, short y, bool is_long = false); + void Create(UIWindow *wnd, int16_t id, const char *name, int16_t x, int16_t y, bool is_long = false); protected: virtual void OnDraw(); // this will use the newuiButton drawing scheme @@ -424,7 +424,7 @@ class newuiRadioButton : public newuiButton, public UIRadioButton { public: newuiRadioButton(); - void Create(UIWindow *wnd, UIRadioButton *prev_rb, short id, const char *name, short x, short y, + void Create(UIWindow *wnd, UIRadioButton *prev_rb, int16_t id, const char *name, int16_t x, int16_t y, bool is_long = false); protected: @@ -445,8 +445,8 @@ protected: #define SUBGADGET_RIGHT 0x2 class newuiSlider : public UIGadget { - short m_pos; - short m_unitrange; + int16_t m_pos; + int16_t m_unitrange; UIBitmapItem *m_bar_bmp; UISnazzyTextItem *m_title; newuiArrowButton m_minus_btn; @@ -456,12 +456,12 @@ class newuiSlider : public UIGadget { public: newuiSlider(); - void Create(UIWindow *wnd, short id, const char *name, short x, short y, short range); - void Offset(short offs); - void SetPos(short pos); - void SetRange(short range); - short GetPos() const { return m_pos; }; - short GetRange() const { return m_unitrange; }; + void Create(UIWindow *wnd, int16_t id, const char *name, int16_t x, int16_t y, int16_t range); + void Offset(int16_t offs); + void SetPos(int16_t pos); + void SetRange(int16_t range); + int16_t GetPos() const { return m_pos; }; + int16_t GetRange() const { return m_unitrange; }; void SetUnits(tSliderSettings *settings); protected: @@ -483,7 +483,7 @@ class newuiEditBox : public UIEdit { public: newuiEditBox(); - void Create(UIWindow *wnd, short id, const char *name, short x, short y, short w, short flags); + void Create(UIWindow *wnd, int16_t id, const char *name, int16_t x, int16_t y, int16_t w, int16_t flags); void EnableOnQuickEscapeBehavior(bool do_it); protected: @@ -863,10 +863,10 @@ void newuiMenu::Create() { } // sets current option to display. -void newuiMenu::SetCurrentOption(short id) { m_newoptionid = id; } +void newuiMenu::SetCurrentOption(int16_t id) { m_newoptionid = id; } // returns current option -short newuiMenu::GetCurrentOption() const { +int16_t newuiMenu::GetCurrentOption() const { if (m_cursheetidx != -1) { return m_sheetbtn[m_cursheetidx].GetID(); } @@ -877,7 +877,7 @@ short newuiMenu::GetCurrentOption() const { newuiSheet *newuiMenu::GetCurrentSheet() const { return m_cursheet; } // when a new option is ready. at this point the system sets the focus on this option -void newuiMenu::SetOnOptionFocusCB(void (*fn)(newuiMenu *, short, void *), void *data) { +void newuiMenu::SetOnOptionFocusCB(void (*fn)(newuiMenu *, int16_t, void *), void *data) { m_option_focus_cb = fn; m_option_focus_cb_data = data; } @@ -936,7 +936,7 @@ int newuiMenu::DoUI() { for (i = 0; i < m_nsheets; i++) { if (i != m_cursheetidx) { if (res == m_sheetbtn[i].GetID() && m_hassheet[i]) { - m_newoptionid = (short)res; + m_newoptionid = (int16_t)res; break; } } @@ -952,7 +952,7 @@ int newuiMenu::DoUI() { // when a new sheet is realized, this function will be called. // passed in: the menu object, the old option and the new option respectively -void newuiMenu::SetOnOptionSwitchCB(void (*fn)(newuiMenu *, short, short, void *), void *data) { +void newuiMenu::SetOnOptionSwitchCB(void (*fn)(newuiMenu *, int16_t, int16_t, void *), void *data) { m_activate_sheet_cb = fn; m_activate_sheet_cb_data = data; } @@ -964,11 +964,11 @@ void newuiMenu::SetOnUIFrameCB(void (*fn)()) { } // adds an option to a menu, returns a newuiSheet object to add user interface to. -void newuiMenu::AddSimpleOption(short id, const char *title, int yoff) { +void newuiMenu::AddSimpleOption(int16_t id, const char *title, int yoff) { newuiMenu::AddOption(id, title, 0, false, yoff); } -newuiSheet *newuiMenu::AddOption(short id, const char *title, int size, bool has_sheet, int yoff) { +newuiSheet *newuiMenu::AddOption(int16_t id, const char *title, int size, bool has_sheet, int yoff) { newuiMenuOptionButton *last_btn = NULL; if (m_nsheets == N_NEWUI_SHEETS) { @@ -1076,7 +1076,7 @@ void newuiLargeMenu::Create() { } // adds an option to a menu, returns a newuiSheet object to add user interface to. -newuiSheet *newuiLargeMenu::AddOption(short id, const char *title, int size) { +newuiSheet *newuiLargeMenu::AddOption(int16_t id, const char *title, int size) { return newuiMenu::AddOption(id, title, size); } @@ -1282,7 +1282,7 @@ void newuiSheet::Reset() { } // set focus on this gadget specified by id upon realization. -void newuiSheet::SetInitialFocusedGadget(short id) { m_initial_focus_id = id; } +void newuiSheet::SetInitialFocusedGadget(int16_t id) { m_initial_focus_id = id; } // call this to initialize gadgets specified above in parent window void newuiSheet::Realize() { @@ -1307,7 +1307,7 @@ void newuiSheet::Realize() { newuiHotspot *hot; UIText *text; UIStatic *bmp; - short flags; + int16_t flags; bool bval; switch (desc->type) { @@ -1676,7 +1676,7 @@ void newuiSheet::UpdateChanges() { for (i = 0; i < m_ngadgets; i++) { newuiSheet::t_gadget_desc *desc = &m_gadgetlist[i]; bool bval; - short sval; + int16_t sval; char sbuftest[EDIT_BUFLEN_MAX]; switch (desc->type) { @@ -1744,7 +1744,7 @@ void newuiSheet::UpdateReturnValues() { for (i = 0; i < m_ngadgets; i++) { newuiSheet::t_gadget_desc *desc = &m_gadgetlist[i]; bool bval; - short sval; + int16_t sval; char sbuftest[EDIT_BUFLEN_MAX]; if (desc->obj.gadget) { @@ -1841,7 +1841,7 @@ bool newuiSheet::HasChanged(int *iptr) { return false; } -bool newuiSheet::HasChanged(short *sptr) { +bool newuiSheet::HasChanged(int16_t *sptr) { int i; ASSERT(m_realized); @@ -1885,13 +1885,13 @@ bool newuiSheet::HasChanged(char *cptr) { return false; } -UIGadget *newuiSheet::GetGadget(short id) { +UIGadget *newuiSheet::GetGadget(int16_t id) { int i; for (i = 0; i < m_ngadgets; i++) { newuiSheet::t_gadget_desc *desc = &m_gadgetlist[i]; - if (desc->obj.gadget && id == (short)desc->obj.gadget->GetID()) { + if (desc->obj.gadget && id == (int16_t)desc->obj.gadget->GetID()) { switch (desc->type) { case GADGET_STATIC_TXT: return desc->obj.gadget; @@ -1934,7 +1934,7 @@ UIGadget *newuiSheet::GetGadget(short id) { return NULL; } -newuiSheet::t_gadget_desc *newuiSheet::AddGadget(short id, int8_t type, const char *title) { +newuiSheet::t_gadget_desc *newuiSheet::AddGadget(int16_t id, int8_t type, const char *title) { int i = m_ngadgets; ASSERT(!m_realized); @@ -1959,7 +1959,7 @@ newuiSheet::t_gadget_desc *newuiSheet::AddGadget(short id, int8_t type, const ch } // creates gadget list. -void newuiSheet::NewGroup(const char *title, short x, short y, tAlignment align, short pix_offset) { +void newuiSheet::NewGroup(const char *title, int16_t x, int16_t y, tAlignment align, int16_t pix_offset) { newuiSheet::t_gadget_desc *gadget = AddGadget(-1, (align == NEWUI_ALIGN_HORIZ) ? GADGET_HGROUP : GADGET_GROUP, title); gadget->parm.s[0] = x; gadget->parm.s[1] = y; @@ -1967,59 +1967,59 @@ void newuiSheet::NewGroup(const char *title, short x, short y, tAlignment align, } // adds standard button to current group. -void newuiSheet::AddButton(const char *title, short id, short flags) { +void newuiSheet::AddButton(const char *title, int16_t id, int16_t flags) { newuiSheet::t_gadget_desc *gadget = AddGadget(id, GADGET_BUTTON, title); gadget->parm.i = flags; } // adds standard long button to current group. -void newuiSheet::AddLongButton(const char *title, short id, short flags) { +void newuiSheet::AddLongButton(const char *title, int16_t id, int16_t flags) { newuiSheet::t_gadget_desc *gadget = AddGadget(id, GADGET_LBUTTON, title); gadget->parm.i = flags; } // adds checkbox to current group. initial state of checkbox can be set. -bool *newuiSheet::AddCheckBox(const char *title, bool init_state, short id) { +bool *newuiSheet::AddCheckBox(const char *title, bool init_state, int16_t id) { newuiSheet::t_gadget_desc *gadget = AddGadget(id, GADGET_CHECKBOX, title); gadget->parm.b = init_state; return &gadget->parm.b; } // adds checkbox to current group. initial state of checkbox can be set. -bool *newuiSheet::AddLongCheckBox(const char *title, bool init_state, short id) { +bool *newuiSheet::AddLongCheckBox(const char *title, bool init_state, int16_t id) { newuiSheet::t_gadget_desc *gadget = AddGadget(id, GADGET_LCHECKBOX, title); gadget->parm.b = init_state; return &gadget->parm.b; } // adds a radio button to current group. initial state of radio may be set -int *newuiSheet::AddFirstRadioButton(const char *title, short id) { +int *newuiSheet::AddFirstRadioButton(const char *title, int16_t id) { newuiSheet::t_gadget_desc *gadget = AddGadget(id, GADGET_RADIO, title); gadget->parm.i = 0; return &gadget->parm.i; } // adds a radio button to current group. initial state of radio may be set -void newuiSheet::AddRadioButton(const char *title, short id) { +void newuiSheet::AddRadioButton(const char *title, int16_t id) { newuiSheet::t_gadget_desc *gadget = AddGadget(id, GADGET_RADIO, title); gadget->parm.i = -1; } // adds a radio button to current group. initial state of radio may be set -int *newuiSheet::AddFirstLongRadioButton(const char *title, short id) { +int *newuiSheet::AddFirstLongRadioButton(const char *title, int16_t id) { newuiSheet::t_gadget_desc *gadget = AddGadget(id, GADGET_LRADIO, title); gadget->parm.i = 0; return &gadget->parm.i; } // adds a radio button to current group. initial state of radio may be set -void newuiSheet::AddLongRadioButton(const char *title, short id) { +void newuiSheet::AddLongRadioButton(const char *title, int16_t id) { newuiSheet::t_gadget_desc *gadget = AddGadget(id, GADGET_LRADIO, title); gadget->parm.i = -1; } // adds a slider, set the range for it too. -short *newuiSheet::AddSlider(const char *title, short range, short init_pos, tSliderSettings *settings, short id) { +int16_t *newuiSheet::AddSlider(const char *title, int16_t range, int16_t init_pos, tSliderSettings *settings, int16_t id) { newuiSheet::t_gadget_desc *gadget = AddGadget(id, GADGET_SLIDER, title); gadget->parm.s[0] = init_pos; gadget->parm.s[1] = range; @@ -2064,7 +2064,7 @@ char *newuiSheet::AddChangeableText(int buflen) { } // adds a hotspot :(, should word wrap too. -void newuiSheet::AddHotspot(const char *title, short w, short h, short id, bool group) { +void newuiSheet::AddHotspot(const char *title, int16_t w, int16_t h, int16_t id, bool group) { newuiSheet::t_gadget_desc *gadget = AddGadget(id, GADGET_HOTSPOT, title); gadget->parm.s[0] = w; gadget->parm.s[1] = h; @@ -2072,7 +2072,7 @@ void newuiSheet::AddHotspot(const char *title, short w, short h, short id, bool } // adds a listbox -newuiListBox *newuiSheet::AddListBox(short w, short h, short id, uint16_t flags) { +newuiListBox *newuiSheet::AddListBox(int16_t w, int16_t h, int16_t id, uint16_t flags) { newuiSheet::t_gadget_desc *gadget = AddGadget(id, GADGET_LISTBOX, NULL); newuiListBox *lb = new newuiListBox; lb->Create(m_parent, id, 0, 0, w, h, flags); @@ -2082,7 +2082,7 @@ newuiListBox *newuiSheet::AddListBox(short w, short h, short id, uint16_t flags) } // adds a listbox -newuiComboBox *newuiSheet::AddComboBox(short id, uint16_t flags) { +newuiComboBox *newuiSheet::AddComboBox(int16_t id, uint16_t flags) { newuiSheet::t_gadget_desc *gadget = AddGadget(id, GADGET_COMBOBOX, NULL); newuiComboBox *cb = new newuiComboBox; cb->Create(m_parent, id, 0, 0, flags); @@ -2092,7 +2092,7 @@ newuiComboBox *newuiSheet::AddComboBox(short id, uint16_t flags) { } // adds an edit box -char *newuiSheet::AddEditBox(const char *title, short maxlen, short w, short id, short flags, bool on_escape_quit) { +char *newuiSheet::AddEditBox(const char *title, int16_t maxlen, int16_t w, int16_t id, int16_t flags, bool on_escape_quit) { int8_t type = GADGET_EDITBOX; if (flags & UIED_PASSWORD) { type = GADGET_EDITBOXPASS; @@ -2128,7 +2128,7 @@ newuiButton::newuiButton() { m_text = NULL; } -void newuiButton::Create(UIWindow *menu, short id, const char *name, short x, short y, short flags) { +void newuiButton::Create(UIWindow *menu, int16_t id, const char *name, int16_t x, int16_t y, int16_t flags) { UITextItem item{""}; UIButton::Create(menu, id, &item, x, y, 10, 8, flags | UIF_FIT); @@ -2145,7 +2145,7 @@ void newuiButton::Create(UIWindow *menu, short id, const char *name, short x, sh newuiButton::InitStates(name, (flags & NEWUI_BTNF_LONG) != 0); } -void newuiTinyButton::Create(UIWindow *wnd, short id, const char *name, short x, short y) { +void newuiTinyButton::Create(UIWindow *wnd, int16_t id, const char *name, int16_t x, int16_t y) { m_bkg = Newui_resources.Load(NEWUI_TINYBTN_FILE); m_litbkg = Newui_resources.Load(NEWUI_TINYBTNLIT_FILE); newuiButton::Create(wnd, id, name, x, y); @@ -2159,7 +2159,7 @@ void newuiButton::OnFormat() { UIGadget::OnFormat(); } -void newuiButton::InitStates(const char *name, bool is_long, short flags) { +void newuiButton::InitStates(const char *name, bool is_long, int16_t flags) { if (!m_bkg) { m_bkg = Newui_resources.Load(is_long ? NEWUI_LBTN_FILE : NEWUI_BTN_FILE); } @@ -2230,8 +2230,8 @@ void newuiButton::OnGainFocus() { ////////////////////////////////////////////////////////////////////////////// // CLASS a large option button used in menus. -void newuiMenuOptionButton::Create(newuiMenu *menu, newuiMenuOptionButton *last, short id, const char *name, short x, - short y, bool mono_press) { +void newuiMenuOptionButton::Create(newuiMenu *menu, newuiMenuOptionButton *last, int16_t id, const char *name, int16_t x, + int16_t y, bool mono_press) { m_bkg = Newui_resources.Load(NEWUI_LRGBTN_FILE); m_litbkg = Newui_resources.Load(NEWUI_LRGBTNLIT_FILE); m_text = GadgetLargeText(name); @@ -2299,7 +2299,7 @@ void newuiMenuOptionButton::OnKeyUp(int key) {} ////////////////////////////////////////////////////////////////////////////// // CLASS creates an arrow button that is sensitive to touch (when down, always select) -void newuiArrowButton::Create(UIWindow *wnd, short id, short type, const char *name, short x, short y) { +void newuiArrowButton::Create(UIWindow *wnd, int16_t id, int16_t type, const char *name, int16_t x, int16_t y) { switch (type) { case NEWUI_ARROW_LEFT: m_bkg = Newui_resources.Load(NEWUI_LARR_FILE); @@ -2401,7 +2401,7 @@ void newuiArrowButton::OnDraw() { newuiCheckBox::newuiCheckBox() {} -void newuiCheckBox::Create(UIWindow *wnd, short id, const char *name, short x, short y, bool is_long) { +void newuiCheckBox::Create(UIWindow *wnd, int16_t id, const char *name, int16_t x, int16_t y, bool is_long) { m_bkg = Newui_resources.Load(is_long ? NEWUI_LCHKBTN_FILE : NEWUI_CHKBTN_FILE); m_litbkg = Newui_resources.Load(is_long ? NEWUI_LCHKBTNLIT_FILE : NEWUI_CHKBTNLIT_FILE); @@ -2418,7 +2418,7 @@ void newuiCheckBox::OnDraw() { newuiButton::OnDraw(); } newuiRadioButton::newuiRadioButton() {} -void newuiRadioButton::Create(UIWindow *wnd, UIRadioButton *prev_rb, short id, const char *name, short x, short y, +void newuiRadioButton::Create(UIWindow *wnd, UIRadioButton *prev_rb, int16_t id, const char *name, int16_t x, int16_t y, bool is_long) { m_bkg = Newui_resources.Load(is_long ? NEWUI_LBTN_FILE : NEWUI_BTN_FILE); m_litbkg = Newui_resources.Load(is_long ? NEWUI_LCHKBTNLIT_FILE : NEWUI_CHKBTNLIT_FILE); @@ -2440,7 +2440,7 @@ newuiSlider::newuiSlider() { m_title = NULL; } -void newuiSlider::Create(UIWindow *wnd, short id, const char *name, short x, short y, short range) { +void newuiSlider::Create(UIWindow *wnd, int16_t id, const char *name, int16_t x, int16_t y, int16_t range) { ASSERT(range > 0); if (name) { @@ -2456,9 +2456,9 @@ void newuiSlider::Create(UIWindow *wnd, short id, const char *name, short x, sho m_unit_settings.type = -1; } -void newuiSlider::Offset(short offs) { newuiSlider::SetPos(m_pos + offs); } +void newuiSlider::Offset(int16_t offs) { newuiSlider::SetPos(m_pos + offs); } -void newuiSlider::SetPos(short pos) { +void newuiSlider::SetPos(int16_t pos) { if (pos < 0) pos = 0; if (pos > m_unitrange) @@ -2466,11 +2466,11 @@ void newuiSlider::SetPos(short pos) { m_pos = pos; } -void newuiSlider::SetRange(short range) { m_unitrange = range; } +void newuiSlider::SetRange(int16_t range) { m_unitrange = range; } // when gadget is added to a window (AddGadget is called) void newuiSlider::OnAttachToWindow() { - short bx = m_X, by = m_Y; + int16_t bx = m_X, by = m_Y; if (m_title) { by += m_title->height() + 5; @@ -2647,7 +2647,7 @@ newuiListBox::newuiListBox() { m_click_time = 0.0f; } -void newuiListBox::Create(UIWindow *wnd, short id, short x, short y, short w, short h, uint16_t flags) { +void newuiListBox::Create(UIWindow *wnd, int16_t id, int16_t x, int16_t y, int16_t w, int16_t h, uint16_t flags) { m_ItemList = NULL; m_Virt2Real = NULL; m_Real2Virt = NULL; @@ -2673,9 +2673,9 @@ void newuiListBox::Create(UIWindow *wnd, short id, short x, short y, short w, sh m_pieces[NW_PIECE_IDX] = Newui_resources.Load(NEWUI_LB_NW_FILE); // determine true width and height (snap width and height to 32 pixel boundaries - short p_w = LB_PIECE_WIDTH, p_h = LB_PIECE_HEIGHT; - short t_width = (w / p_w); - short t_height = (h / p_h); + int16_t p_w = LB_PIECE_WIDTH, p_h = LB_PIECE_HEIGHT; + int16_t t_width = (w / p_w); + int16_t t_height = (h / p_h); if (w % p_w) t_width++; if (h % p_h) @@ -3390,7 +3390,7 @@ void newuiListBox::OnDetachFromWindow() { m_up_btn.Destroy(); } -void newuiListBox::Offset(short offs) { +void newuiListBox::Offset(int16_t offs) { m_Index = m_Index + offs; if (m_Index < 0) { m_Index = 0; @@ -3410,7 +3410,7 @@ newuiComboBox::newuiComboBox() { m_Index = 0; } -void newuiComboBox::Create(UIWindow *wnd, short id, short x, short y, uint16_t flags) { +void newuiComboBox::Create(UIWindow *wnd, int16_t id, int16_t x, int16_t y, uint16_t flags) { m_ItemList = NULL; m_Virt2Real = NULL; m_Real2Virt = NULL; @@ -3911,7 +3911,7 @@ void newuiComboBox::OnDetachFromWindow() { newuiEditBox::newuiEditBox() { m_title = NULL; } -void newuiEditBox::Create(UIWindow *wnd, short id, const char *name, short x, short y, short w, short flags) { +void newuiEditBox::Create(UIWindow *wnd, int16_t id, const char *name, int16_t x, int16_t y, int16_t w, int16_t flags) { // if (name) { // m_title = new UISnazzyTextItem(0, MONITOR9_NEWUI_FONT, name, NEWUI_MONITORFONT_COLOR); // } @@ -3967,7 +3967,7 @@ void newuiEditBox::OnKeyDown(int key) { newuiHotspot::newuiHotspot() { m_title = NULL; } -void newuiHotspot::Create(UIWindow *wnd, short id, const char *title, short x, short y, short w, short h, short flags) { +void newuiHotspot::Create(UIWindow *wnd, int16_t id, const char *title, int16_t x, int16_t y, int16_t w, int16_t h, int16_t flags) { if (title) { m_title = mem_strdup(title); } else { @@ -4077,7 +4077,7 @@ newuiTiledWindow::newuiTiledWindow() { m_realized = false; } -void newuiTiledWindow::Create(const char *title, short x, short y, short w, short h, int flags) { +void newuiTiledWindow::Create(const char *title, int16_t x, int16_t y, int16_t w, int16_t h, int flags) { if (title) { ASSERT(strlen(title) < (sizeof(m_title) - 1)); } diff --git a/Descent3/newui_core.h b/Descent3/newui_core.h index 1b34944b..d4c3a896 100644 --- a/Descent3/newui_core.h +++ b/Descent3/newui_core.h @@ -188,7 +188,7 @@ struct tSliderSettings { class newuiSheet { int m_sx, m_sy; // origin of sheet gadgets relative to parent. - short m_initial_focus_id; // gadget that will have focus upon realization. + int16_t m_initial_focus_id; // gadget that will have focus upon realization. public: newuiSheet(); @@ -218,48 +218,48 @@ public: // call these functions to determine if a pointer's value has changed after call to UpdateReturnValues (internal) bool HasChanged(bool *bptr); - bool HasChanged(short *sptr); + bool HasChanged(int16_t *sptr); bool HasChanged(int *iptr); bool HasChanged(char *cptr); // obtain's pointer to gadget of respective item. it is your responsibility to typecast the gadget // only works if you specified an ID! Also the sheet must have been realized by now. - UIGadget *GetGadget(short id); + UIGadget *GetGadget(int16_t id); // set focus on this gadget specified by id upon realization. - void SetInitialFocusedGadget(short id); + void SetInitialFocusedGadget(int16_t id); // creates gadget list.pix_offset is the pixel offset from the group title to the first control. - void NewGroup(const char *title, short x, short y, tAlignment align = NEWUI_ALIGN_VERT, short pix_offset = -1); + void NewGroup(const char *title, int16_t x, int16_t y, tAlignment align = NEWUI_ALIGN_VERT, int16_t pix_offset = -1); // adds standard button to current group. (flags see NEWUI_BTNF_xxxx) - void AddButton(const char *title, short id, short flags = 0); + void AddButton(const char *title, int16_t id, int16_t flags = 0); // adds a long button (flags see NEWUI_BTNF_xxxx) - void AddLongButton(const char *title, short id, short flags = 0); + void AddLongButton(const char *title, int16_t id, int16_t flags = 0); // adds checkbox to current group. initial state of checkbox can be set. - bool *AddCheckBox(const char *title, bool init_state = false, short id = DEFAULT_NEWUID); + bool *AddCheckBox(const char *title, bool init_state = false, int16_t id = DEFAULT_NEWUID); // adds long checkbox to current group. initial state of checkbox can be set. - bool *AddLongCheckBox(const char *title, bool init_state = false, short id = DEFAULT_NEWUID); + bool *AddLongCheckBox(const char *title, bool init_state = false, int16_t id = DEFAULT_NEWUID); // adds a radio button to current group. initial state of radio may be set // pointer returned will return index of radio button in group currently selected. - int *AddFirstRadioButton(const char *title, short id = DEFAULT_NEWUID); + int *AddFirstRadioButton(const char *title, int16_t id = DEFAULT_NEWUID); // adds a radio button to current group. initial state of radio may be set - void AddRadioButton(const char *title, short id = DEFAULT_NEWUID); + void AddRadioButton(const char *title, int16_t id = DEFAULT_NEWUID); // adds a radio button to current group. initial state of radio may be set - int *AddFirstLongRadioButton(const char *title, short id = DEFAULT_NEWUID); + int *AddFirstLongRadioButton(const char *title, int16_t id = DEFAULT_NEWUID); // adds a radio button to current group. initial state of radio may be set - void AddLongRadioButton(const char *title, short id = DEFAULT_NEWUID); + void AddLongRadioButton(const char *title, int16_t id = DEFAULT_NEWUID); - // adds a slider, set the range for it too., returns two values, short[0] = position, short[1] = range - short *AddSlider(const char *title, short range, short init_pos = 0, tSliderSettings *settings = NULL, - short id = DEFAULT_NEWUID); + // adds a slider, set the range for it too., returns two values, int16_t[0] = position, int16_t[1] = range + int16_t *AddSlider(const char *title, int16_t range, int16_t init_pos = 0, tSliderSettings *settings = NULL, + int16_t id = DEFAULT_NEWUID); // adds a static text item void AddText(const char *text, ...); @@ -271,17 +271,17 @@ public: char *AddChangeableText(int buflen); // adds a listbox - newuiListBox *AddListBox(short w, short h, short id, uint16_t flags = 0); + newuiListBox *AddListBox(int16_t w, int16_t h, int16_t id, uint16_t flags = 0); // adds a listbox - newuiComboBox *AddComboBox(short id, uint16_t flags = 0); + newuiComboBox *AddComboBox(int16_t id, uint16_t flags = 0); // adds an edit box - char *AddEditBox(const char *title, short maxlen = NEWUI_EDIT_BUFLEN, short w = 0, short id = DEFAULT_NEWUID, - short flags = 0, bool return_on_esc = false); + char *AddEditBox(const char *title, int16_t maxlen = NEWUI_EDIT_BUFLEN, int16_t w = 0, int16_t id = DEFAULT_NEWUID, + int16_t flags = 0, bool return_on_esc = false); // adds a hotspot :(, should word wrap too. - void AddHotspot(const char *title, short w, short h, short id, bool group = false); + void AddHotspot(const char *title, int16_t w, int16_t h, int16_t id, bool group = false); // THESE FUNCTIONS ARE CALLED BY FRAMEWORK, BUT IF YOU NEED TO DO SOME CUSTOM UI HANDLING, THESE // FUNCTIONS ARE MADE PUBLIC. @@ -298,11 +298,11 @@ private: struct t_gadget_desc { int8_t type; // enumerated ui gadget type bool changed; // parameters are different than defaults? - short id; // id value + int16_t id; // id value char *title; // title of gadget union { int i; - short s[2]; + int16_t s[2]; bool b; void *p; } parm; // parameter list. @@ -326,7 +326,7 @@ private: bool m_realized; char *m_title; - t_gadget_desc *AddGadget(short id, int8_t type, const char *title); + t_gadget_desc *AddGadget(int16_t id, int8_t type, const char *title); public: const char *GetTitle() { return m_title; }; @@ -339,7 +339,7 @@ public: newuiButton(); // see (NEWUI_BTNF_xxx) flags - void Create(UIWindow *wnd, short id, const char *name, short x, short y, short flags = 0); + void Create(UIWindow *wnd, int16_t id, const char *name, int16_t x, int16_t y, int16_t flags = 0); protected: virtual void OnDraw(); // overridable draws the background first @@ -352,7 +352,7 @@ protected: UISnazzyTextItem *m_text; // this is used in multiple inheritance cases.(flags are additional attributes usually passed when creating gadget) - void InitStates(const char *name, bool is_long, short flags = 0); + void InitStates(const char *name, bool is_long, int16_t flags = 0); public: UISnazzyTextItem *GetTitle() { return m_text; }; @@ -362,7 +362,7 @@ public: class newuiMenuOptionButton : public newuiButton { public: - void Create(newuiMenu *menu, newuiMenuOptionButton *last, short id, const char *name, short x, short y, + void Create(newuiMenu *menu, newuiMenuOptionButton *last, int16_t id, const char *name, int16_t x, int16_t y, bool m_mono_press); protected: @@ -378,7 +378,7 @@ private: class newuiTinyButton : public newuiButton { public: - void Create(UIWindow *wnd, short id, const char *name, short x, short y); + void Create(UIWindow *wnd, int16_t id, const char *name, int16_t x, int16_t y); }; // CLASS creates an arrow button that is sensitive to touch (when down, always select) @@ -387,7 +387,7 @@ class newuiArrowButton : public newuiButton { public: newuiArrowButton(){}; - void Create(UIWindow *wnd, short id, short type, const char *name, short x, short y); + void Create(UIWindow *wnd, int16_t id, int16_t type, const char *name, int16_t x, int16_t y); void Show(bool show = true); // this will activate or deactivate a button. protected: @@ -410,7 +410,7 @@ public: newuiListBox(); // creates listbox - void Create(UIWindow *wnd, short id, short x, short y, short w, short h, uint16_t flags); + void Create(UIWindow *wnd, int16_t id, int16_t x, int16_t y, int16_t w, int16_t h, uint16_t flags); // functions to add or remove items, void AddItem(const char *name); @@ -469,7 +469,7 @@ private: UIBitmapItem *m_pieces[N_DIRECTIONS]; // bitmap pieces - void Offset(short offs); + void Offset(int16_t offs); void SetInternalCurrentIndex(int index); }; @@ -480,7 +480,7 @@ public: newuiComboBox(); // creates listbox - void Create(UIWindow *wnd, short id, short x, short y, uint16_t flags); + void Create(UIWindow *wnd, int16_t id, int16_t x, int16_t y, uint16_t flags); // functions to add or remove items, void AddItem(const char *name); @@ -529,13 +529,13 @@ private: class newuiHotspot : public UIGadget { private: char *m_title; - short m_alpha, m_alpha_adjust; + int16_t m_alpha, m_alpha_adjust; float m_mse_timer; public: newuiHotspot(); - void Create(UIWindow *wnd, short id, const char *title, short x, short y, short w, short h, short flags = 0); + void Create(UIWindow *wnd, int16_t id, const char *title, int16_t x, int16_t y, int16_t w, int16_t h, int16_t flags = 0); const char *GetTitle() const { return m_title; }; protected: @@ -563,14 +563,14 @@ public: void Create(); // adds an option to a menu, returns a newuiSheet object to add user interface to. - newuiSheet *AddOption(short id, const char *title, int size = NEWUIMENU_SMALL, bool has_sheet = true, int yoff = 0); - void AddSimpleOption(short id, const char *title, int yoff = 0); + newuiSheet *AddOption(int16_t id, const char *title, int size = NEWUIMENU_SMALL, bool has_sheet = true, int yoff = 0); + void AddSimpleOption(int16_t id, const char *title, int yoff = 0); // sets current option to display. - void SetCurrentOption(short id); + void SetCurrentOption(int16_t id); // returns current option - short GetCurrentOption() const; + int16_t GetCurrentOption() const; // returns current sheet newuiSheet *GetCurrentSheet() const; @@ -586,10 +586,10 @@ public: public: // when a new option is realized, this function will be called. // passed in: the menu object, the old option and the new option and an optional pointer respectively - void SetOnOptionSwitchCB(void (*fn)(newuiMenu *, short, short, void *), void *data); + void SetOnOptionSwitchCB(void (*fn)(newuiMenu *, int16_t, int16_t, void *), void *data); // when a new option is ready. at this point the system sets the focus on this option - void SetOnOptionFocusCB(void (*fn)(newuiMenu *, short, void *), void *data); + void SetOnOptionFocusCB(void (*fn)(newuiMenu *, int16_t, void *), void *data); // equivalent of SetUICallback, called before gadgets are drawn void SetOnUIFrameCB(void (*fn)()); @@ -610,12 +610,12 @@ private: int m_optionsx, m_optionsy; // option button placements int m_titlex, m_titley; // title location. tAlignment m_align; // alignment of text - short m_newoptionid; // tells that a new option has been selected. - short m_cursheetidx; + int16_t m_newoptionid; // tells that a new option has been selected. + int16_t m_cursheetidx; bool m_refreshgadgets; // refreshes gadgets on current sheet. - void (*m_activate_sheet_cb)(newuiMenu *, short, short, void *); - void (*m_option_focus_cb)(newuiMenu *, short, void *); + void (*m_activate_sheet_cb)(newuiMenu *, int16_t, int16_t, void *); + void (*m_option_focus_cb)(newuiMenu *, int16_t, void *); void (*m_uiframe_cb)(); void *m_activate_sheet_cb_data; @@ -630,7 +630,7 @@ public: void Create(); // adds an option to a menu, returns a newuiSheet object to add user interface to. - newuiSheet *AddOption(short id, const char *title, int size = NEWUIMENU_MEDIUM); + newuiSheet *AddOption(int16_t id, const char *title, int size = NEWUIMENU_MEDIUM); }; // CLASS, small message box @@ -668,7 +668,7 @@ class newuiTiledWindow : public UIWindow { public: newuiTiledWindow(); - void Create(const char *title, short x, short y, short w, short h, int flags = 0); + void Create(const char *title, int16_t x, int16_t y, int16_t w, int16_t h, int flags = 0); // grab a newui interface from it. newuiSheet *GetSheet(); @@ -714,27 +714,27 @@ private: #define F_APPROXIMATE(_f) ((_f) + 0.000001f) -inline short CALC_SLIDER_POS_FLOAT(float val, const tSliderSettings *settings, short range) { - short curpos; - curpos = (short)F_APPROXIMATE(((val - settings->min_val.f) * range) / (settings->max_val.f - settings->min_val.f)); +inline int16_t CALC_SLIDER_POS_FLOAT(float val, const tSliderSettings *settings, int16_t range) { + int16_t curpos; + curpos = (int16_t)F_APPROXIMATE(((val - settings->min_val.f) * range) / (settings->max_val.f - settings->min_val.f)); return curpos; } -inline short CALC_SLIDER_POS_INT(int val, const tSliderSettings *settings, short range) { - short curpos; +inline int16_t CALC_SLIDER_POS_INT(int val, const tSliderSettings *settings, int16_t range) { + int16_t curpos; float num = (float)((val - settings->min_val.i) * range); float dem = (float)((settings->max_val.i - settings->min_val.i)); - curpos = (short)F_APPROXIMATE(num / dem); + curpos = (int16_t)F_APPROXIMATE(num / dem); return curpos; } -inline float CALC_SLIDER_FLOAT_VALUE(short val, float min, float max, short range) { +inline float CALC_SLIDER_FLOAT_VALUE(int16_t val, float min, float max, int16_t range) { float retval; retval = F_APPROXIMATE((max - min) * val / range) + min; return retval; } -inline int CALC_SLIDER_INT_VALUE(short val, int min, int max, short range) { +inline int CALC_SLIDER_INT_VALUE(int16_t val, int min, int max, int16_t range) { int retval; float num = (float)((max - min) * val); retval = (int)(F_APPROXIMATE(num / range)) + min; diff --git a/Descent3/object.cpp b/Descent3/object.cpp index a4949bd3..5087ab79 100644 --- a/Descent3/object.cpp +++ b/Descent3/object.cpp @@ -1199,7 +1199,7 @@ object *Player_object = NULL; // the object that is the player object *Viewer_object = NULL; // which object we are seeing from -static short free_obj_list[MAX_OBJECTS]; +static int16_t free_obj_list[MAX_OBJECTS]; // Data for objects @@ -1212,7 +1212,7 @@ object Objects[MAX_OBJECTS]; tPosHistory Object_position_samples[MAX_OBJECT_POS_HISTORY]; uint8_t Object_position_head; int16_t Object_map_position_history[MAX_OBJECTS]; -short Object_map_position_free_slots[MAX_OBJECT_POS_HISTORY]; +int16_t Object_map_position_free_slots[MAX_OBJECT_POS_HISTORY]; uint16_t Num_free_object_position_history; int Num_objects = 0; @@ -1254,7 +1254,7 @@ char *Object_type_names[MAX_OBJECT_TYPES] = { #endif int Num_big_objects = 0; -short BigObjectList[MAX_BIG_OBJECTS]; // DAJ_MR utb int +int16_t BigObjectList[MAX_BIG_OBJECTS]; // DAJ_MR utb int /* * Local Function Prototypes diff --git a/Descent3/object.h b/Descent3/object.h index ec228140..6ae3a7b7 100644 --- a/Descent3/object.h +++ b/Descent3/object.h @@ -694,7 +694,7 @@ extern object *Viewer_object; // which object we are seeing from #define MAX_BIG_OBJECTS 350 extern int Num_big_objects; -extern short BigObjectList[MAX_BIG_OBJECTS]; // DAJ_MR utb int +extern int16_t BigObjectList[MAX_BIG_OBJECTS]; // DAJ_MR utb int // Compute the object number from an object pointer #define OBJNUM(objp) (objp - Objects) diff --git a/Descent3/objinfo.h b/Descent3/objinfo.h index c4c99660..71ca21b7 100644 --- a/Descent3/objinfo.h +++ b/Descent3/objinfo.h @@ -370,7 +370,7 @@ extern char *Anim_state_names[]; // Info for an animation state typedef struct { - short from, to; + int16_t from, to; float spc; int anim_sound_index; uint8_t used; @@ -477,10 +477,10 @@ typedef struct { char *description; // used for inventory char icon_name[MAX_INVEN_ICON_SIZE]; // used for inventory - short sounds[MAX_OBJ_SOUNDS]; // list of sound handles - short dspew[MAX_DSPEW_TYPES]; + int16_t sounds[MAX_OBJ_SOUNDS]; // list of sound handles + int16_t dspew[MAX_DSPEW_TYPES]; float dspew_percent[MAX_DSPEW_TYPES]; - short dspew_number[MAX_DSPEW_TYPES]; + int16_t dspew_number[MAX_DSPEW_TYPES]; uint8_t f_dspew; // Valid for physics objects only diff --git a/Descent3/osiris_predefs.cpp b/Descent3/osiris_predefs.cpp index 13ba0beb..57f2297b 100644 --- a/Descent3/osiris_predefs.cpp +++ b/Descent3/osiris_predefs.cpp @@ -2307,9 +2307,9 @@ void osipf_MatcenValue(int matcen_id, char op, char var_handle, void *ptr, int i break; case MTNV_S_CREATION_TEXTURE: if (op == VF_GET) - (*(short *)ptr) = Matcen[matcen_id]->GetCreationTexture(); + (*(int16_t *)ptr) = Matcen[matcen_id]->GetCreationTexture(); else if (op == VF_SET) - Matcen[matcen_id]->SetCreationTexture(*(short *)ptr); + Matcen[matcen_id]->SetCreationTexture(*(int16_t *)ptr); break; case MTNV_C_NUM_SPAWN_PTS: @@ -2477,9 +2477,9 @@ int osipf_CFReadBytes(uint8_t *buffer, int count, CFILE *cfp) { return cf_ReadBy // Throws an exception of type (cfile_error *) if the OS returns an error on read int osipf_CFReadInt(CFILE *cfp) { return cf_ReadInt(cfp); } -// Read and return a short (16 bits) +// Read and return a int16_t (16 bits) // Throws an exception of type (cfile_error *) if the OS returns an error on read -short osipf_CFReadShort(CFILE *cfp) { return cf_ReadShort(cfp); } +int16_t osipf_CFReadShort(CFILE *cfp) { return cf_ReadShort(cfp); } // Read and return a byte (8 bits) // Throws an exception of type (cfile_error *) if the OS returns an error on read @@ -2528,9 +2528,9 @@ int osipf_CFWriteString(const char *buf, CFILE *cfp) { return cf_WriteString(cfp // Throws an exception of type (cfile_error *) if the OS returns an error on write void osipf_CFWriteInt(int i, CFILE *cfp) { cf_WriteInt(cfp, i); } -// Write a short (16 bits) +// Write a int16_t (16 bits) // Throws an exception of type (cfile_error *) if the OS returns an error on write -void osipf_CFWriteShort(short s, CFILE *cfp) { cf_WriteShort(cfp, s); } +void osipf_CFWriteShort(int16_t s, CFILE *cfp) { cf_WriteShort(cfp, s); } // Write a byte (8 bits). If the byte is a newline & the file is a text file, writes a CR/LF pair. // Throws an exception of type (cfile_error *) if the OS returns an error on write @@ -3319,12 +3319,12 @@ void osipf_AIGoalValue(int obj_handle, char g_index, char op, char vtype, void * int osipf_AIGetNearbyObjs(vector *pos, int init_roomnum, float rad, int *object_handle_list, int max_elements, bool f_lightmap_only, bool f_only_players_and_ais, bool f_include_non_collide_objects, bool f_stop_at_closed_doors) { - short *s_list; + int16_t *s_list; int num_close; int i; int count = 0; - s_list = (short *)mem_malloc(sizeof(short) * max_elements); + s_list = (int16_t *)mem_malloc(sizeof(int16_t) * max_elements); num_close = fvi_QuickDistObjectList(pos, init_roomnum, rad, s_list, max_elements, f_lightmap_only, f_only_players_and_ais, f_include_non_collide_objects, f_stop_at_closed_doors); diff --git a/Descent3/osiris_predefs.h b/Descent3/osiris_predefs.h index 8e540f64..b1d16431 100644 --- a/Descent3/osiris_predefs.h +++ b/Descent3/osiris_predefs.h @@ -266,9 +266,9 @@ int osipf_CFReadBytes(uint8_t *buffer, int count, CFILE *cfp); // Throws an exception of type (cfile_error *) if the OS returns an error on read int osipf_CFReadInt(CFILE *cfp); -// Read and return a short (16 bits) +// Read and return a int16_t (16 bits) // Throws an exception of type (cfile_error *) if the OS returns an error on read -short osipf_CFReadShort(CFILE *cfp); +int16_t osipf_CFReadShort(CFILE *cfp); // Read and return a byte (8 bits) // Throws an exception of type (cfile_error *) if the OS returns an error on read @@ -317,9 +317,9 @@ int osipf_CFWriteString(const char *buf, CFILE *cfp); // Throws an exception of type (cfile_error *) if the OS returns an error on write void osipf_CFWriteInt(int i, CFILE *cfp); -// Write a short (16 bits) +// Write a int16_t (16 bits) // Throws an exception of type (cfile_error *) if the OS returns an error on write -void osipf_CFWriteShort(short s, CFILE *cfp); +void osipf_CFWriteShort(int16_t s, CFILE *cfp); // Write a byte (8 bits). If the byte is a newline & the file is a text file, writes a CR/LF pair. // Throws an exception of type (cfile_error *) if the OS returns an error on write diff --git a/Descent3/pilot.cpp b/Descent3/pilot.cpp index e6063f2c..a71a8b1d 100644 --- a/Descent3/pilot.cpp +++ b/Descent3/pilot.cpp @@ -929,7 +929,7 @@ void PilotListSelectChangeCallback(int index) { PilotChooseDialogInfo.initial_call = false; } -void selectcb(newuiMenu *menu, short id, void *data) { +void selectcb(newuiMenu *menu, int16_t id, void *data) { pilot_select_menu *select = (pilot_select_menu *)data; if (id == IDP_SELECT) { menu->SetFocusOnGadget(select->pilot_list); diff --git a/Descent3/player.h b/Descent3/player.h index d3b14eb5..de54a74f 100644 --- a/Descent3/player.h +++ b/Descent3/player.h @@ -184,7 +184,7 @@ * added multiple colored balls for players * * 54 6/25/98 12:45p Jeff - * fixed callsign length, it was too short + * fixed callsign length, it was too int16_t * * 53 5/26/98 7:49p Samir * E3 version has a long afterburner. diff --git a/Descent3/postrender.h b/Descent3/postrender.h index 919a245c..5a6ae837 100644 --- a/Descent3/postrender.h +++ b/Descent3/postrender.h @@ -28,12 +28,12 @@ typedef struct { uint8_t type; // See types above union { - short objnum; - short visnum; - short facenum; + int16_t objnum; + int16_t visnum; + int16_t facenum; }; - short roomnum; + int16_t roomnum; float z; } postrender_struct; diff --git a/Descent3/powerup.h b/Descent3/powerup.h index 4f749f67..48b1aded 100644 --- a/Descent3/powerup.h +++ b/Descent3/powerup.h @@ -92,7 +92,7 @@ typedef struct { int flags; uint16_t used; - short sounds[MAX_POWERUP_SOUNDS]; + int16_t sounds[MAX_POWERUP_SOUNDS]; // Default physics information for this powerup type physics_info phys_info; // the physics data for this obj type. diff --git a/Descent3/procedurals.cpp b/Descent3/procedurals.cpp index ed61f4e6..4a606c28 100644 --- a/Descent3/procedurals.cpp +++ b/Descent3/procedurals.cpp @@ -71,7 +71,7 @@ static float Noise_table[TABSIZE * 3]; dynamic_proc_element DynamicProcElements[MAX_PROC_ELEMENTS]; uint16_t DefaultProcPalette[256]; int Num_proc_elements = 0; -static short Proc_free_list[MAX_PROC_ELEMENTS]; +static int16_t Proc_free_list[MAX_PROC_ELEMENTS]; uint16_t ProcFadeTable[32768]; #define NUM_WATER_SHADES 64 uint16_t WaterProcTableHi[NUM_WATER_SHADES][256]; @@ -815,8 +815,8 @@ void CalcWater2(int handle, int density) { int count = PROC_SIZE + 1; proc_struct *procedural = GameTextures[handle].procedural; - short *newptr = (short *)procedural->proc2; - short *oldptr = (short *)procedural->proc1; + int16_t *newptr = (int16_t *)procedural->proc2; + int16_t *oldptr = (int16_t *)procedural->proc1; int x, y; @@ -878,8 +878,8 @@ void CalcWater(int handle, int density) { int count = PROC_SIZE + 1; proc_struct *procedural = GameTextures[handle].procedural; - short *newptr = (short *)procedural->proc2; - short *oldptr = (short *)procedural->proc1; + int16_t *newptr = (int16_t *)procedural->proc2; + int16_t *oldptr = (int16_t *)procedural->proc1; int x, y; @@ -937,7 +937,7 @@ void DrawWaterNoLight(int handle) { int dest_bitmap = procedural->procedural_bitmap; uint16_t *dest_data = (uint16_t *)bm_data(dest_bitmap, 0); uint16_t *src_data = (uint16_t *)bm_data(GameTextures[handle].bm_handle, 0); - short *ptr = (short *)procedural->proc1; + int16_t *ptr = (int16_t *)procedural->proc1; for (y = 0; y < PROC_SIZE; y++) { for (x = 0; x < PROC_SIZE; x++, offset++) { if (x == PROC_SIZE - 1) @@ -968,7 +968,7 @@ void DrawWaterWithLight(int handle, int lightval) { int dest_bitmap = procedural->procedural_bitmap; uint16_t *dest_data = (uint16_t *)bm_data(dest_bitmap, 0); uint16_t *src_data = (uint16_t *)bm_data(GameTextures[handle].bm_handle, 0); - short *ptr = (short *)procedural->proc1; + int16_t *ptr = (int16_t *)procedural->proc1; for (y = 0; y < PROC_SIZE; y++) { int ychange, ychange2; if (y == PROC_SIZE - 1) { @@ -1015,7 +1015,7 @@ void AddProcHeightBlob(static_proc_element *proc, int handle) { int rquad; int cx, cy, cyq; int left, top, right, bottom; - short *dest_data = (short *)GameTextures[handle].procedural->proc1; + int16_t *dest_data = (int16_t *)GameTextures[handle].procedural->proc1; int x = proc->x1; int y = proc->y1; int procnum = proc - GameTextures[handle].procedural->static_proc_elements; @@ -1100,7 +1100,7 @@ void AddProcSineBlob(static_proc_element *proc, int handle) { int radius = proc->size; int radsquare = radius * radius; float length = (1024.0 / (float)radius) * (1024.0 / (float)radius); - short *dest_data = (short *)GameTextures[handle].procedural->proc1; + int16_t *dest_data = (int16_t *)GameTextures[handle].procedural->proc1; int height = proc->speed; radsquare = (radius * radius); left = -radius; @@ -1174,7 +1174,7 @@ void EvaluateWaterProcedural(int handle) { if (EasterEgg) { if (Easter_egg_handle != -1) { uint16_t *src_data = bm_data(Easter_egg_handle, 0); - short *dest_data = (short *)GameTextures[handle].procedural->proc1; + int16_t *dest_data = (int16_t *)GameTextures[handle].procedural->proc1; int sw = bm_w(Easter_egg_handle, 0); int sh = bm_w(Easter_egg_handle, 0); int x1 = (PROC_SIZE / 2) - (sw / 2); @@ -1224,7 +1224,7 @@ void EvaluateWaterProcedural(int handle) { } CalcWater(handle, thickness); // Swap for next time - short *temp = (short *)procedural->proc1; + int16_t *temp = (int16_t *)procedural->proc1; procedural->proc1 = procedural->proc2; procedural->proc2 = temp; } diff --git a/Descent3/procedurals.h b/Descent3/procedurals.h index b545445c..1bda4e3b 100644 --- a/Descent3/procedurals.h +++ b/Descent3/procedurals.h @@ -56,7 +56,7 @@ typedef struct { fix x1, y1; - short prev, next; + int16_t prev, next; } dynamic_proc_element; extern dynamic_proc_element DynamicProcElements[]; diff --git a/Descent3/render.cpp b/Descent3/render.cpp index 10ca8f79..8a80535d 100644 --- a/Descent3/render.cpp +++ b/Descent3/render.cpp @@ -148,12 +148,12 @@ char Rooms_visited[MAX_ROOMS + MAX_PALETTE_ROOMS]; int Facing_visited[MAX_ROOMS + MAX_PALETTE_ROOMS]; // For keeping track of portal recursion uint8_t Room_depth_list[MAX_ROOMS + MAX_PALETTE_ROOMS]; -short Render_list[MAX_RENDER_ROOMS]; -short External_room_list[MAX_ROOMS]; +int16_t Render_list[MAX_RENDER_ROOMS]; +int16_t External_room_list[MAX_ROOMS]; int N_external_rooms; // For rendering specular faces #define MAX_SPECULAR_FACES 2500 -short Specular_faces[MAX_SPECULAR_FACES]; +int16_t Specular_faces[MAX_SPECULAR_FACES]; int Num_specular_faces_to_render = 0; int Num_real_specular_faces_to_render = 0; // Non-invisible specular faces typedef struct { @@ -173,7 +173,7 @@ int Room_fog_plane_check = 0; float Room_fog_distance = 0; float Room_fog_eye_distance = 0; vector Room_fog_plane, Room_fog_portal_vert; -short Fog_faces[MAX_FACES_PER_ROOM]; +int16_t Fog_faces[MAX_FACES_PER_ROOM]; int Num_fog_faces_to_render = 0; #define MAX_EXTERNAL_ROOMS 100 vector External_room_corners[MAX_EXTERNAL_ROOMS][8]; @@ -185,8 +185,8 @@ uint8_t External_room_project_net[MAX_EXTERNAL_ROOMS]; #define LGF_INCREASING 2 #define LGF_FAST 4 typedef struct { - short roomnum; - short facenum; + int16_t roomnum; + int16_t facenum; float size; vector center; float scalar; @@ -206,9 +206,9 @@ vector Global_alter_vec = {19, -19, 19}; bool Render_mirror_for_room = false; int Mirror_room; int Num_mirrored_rooms; -short Mirrored_room_list[MAX_ROOMS]; +int16_t Mirrored_room_list[MAX_ROOMS]; uint8_t Mirrored_room_checked[MAX_ROOMS]; -short Mirror_rooms[MAX_ROOMS]; +int16_t Mirror_rooms[MAX_ROOMS]; int Num_mirror_rooms = 0; // // UTILITY FUNCS @@ -1070,7 +1070,7 @@ void BuildRoomListSub(int start_room_num, clip_wnd *wnd, int depth) { } // compare function for room z sort float Room_z_depth[MAX_ROOMS + MAX_PALETTE_ROOMS]; -static int Room_z_sort_func(const short *a, const short *b) { +static int Room_z_sort_func(const int16_t *a, const int16_t *b) { float az, bz; az = Room_z_depth[*a]; bz = Room_z_depth[*b]; @@ -2129,7 +2129,7 @@ draw_fog: } static float face_depth[MAX_FACES_PER_ROOM]; // compare function for room face sort -static int room_face_sort_func(const short *a, const short *b) { +static int room_face_sort_func(const int16_t *a, const int16_t *b) { float az, bz; az = face_depth[*a]; bz = face_depth[*b]; @@ -3804,7 +3804,7 @@ void RenderBlankScreen(void) { rend_ClearScreen(GR_BLACK); } // roomnum,facenum - these are filled in with the found values // if room<0, then an object was found, and the object number is -room-1 // Returns: 1 if found a room, else 0 -/*int FindRoomFace(short x,short y,int start_roomnum,int *roomnum,int *facenum) +/*int FindRoomFace(int16_t x,int16_t y,int start_roomnum,int *roomnum,int *facenum) { //Init search mode search_mode = -1; @@ -3826,7 +3826,7 @@ void RenderBlankScreen(void) { rend_ClearScreen(GR_BLACK); } // start_roomnum - where to start rendering // roomnum,facenum,lumel_num - these are filled in with the found values // Returns: 1 if found a room, else 0 -/*int FindLightmapFace(short x,short y,int start_roomnum,int *roomnum,int *facenum,int *lumel_num) +/*int FindLightmapFace(int16_t x,int16_t y,int start_roomnum,int *roomnum,int *facenum,int *lumel_num) { Search_lightmaps=1; search_x = x; search_y = y; diff --git a/Descent3/render.h b/Descent3/render.h index 4d7f3903..bd1f5671 100644 --- a/Descent3/render.h +++ b/Descent3/render.h @@ -188,7 +188,7 @@ extern bool Render_inside_only; #define Lighting_on 1 #define Outline_mode 0 #endif -extern short use_opengl_1555_format; // DAJ +extern int16_t use_opengl_1555_format; // DAJ #ifndef RELEASE extern int Mine_depth; @@ -218,7 +218,7 @@ extern vector Room_fog_plane, Room_fog_portal_vert; struct face; typedef struct { - short roomnum; + int16_t roomnum; float close_dist; face *close_face; } fog_portal_data; @@ -264,7 +264,7 @@ void RenderMine(int viewer_roomnum, int flag_automap = 0, int called_from_terrai // roomnum,facenum - these are filled in with the found values // if room<0, then an object was found, and the object number is -room-1 // Returns: 1 if found a room, else 0 -int FindRoomFace(short x, short y, int start_roomnum, int *roomnum, int *facenum); +int FindRoomFace(int16_t x, int16_t y, int start_roomnum, int *roomnum, int *facenum); // finds what room,face,lumel is visible at a given screen x & y // Everything must be set up just like for RenderMineRoom(), and presumably is the same as @@ -273,7 +273,7 @@ int FindRoomFace(short x, short y, int start_roomnum, int *roomnum, int *facenum // start_roomnum - where to start rendering // roomnum,facenum,lumel_num - these are filled in with the found values // Returns: 1 if found a room, else 0 -int FindLightmapFace(short x, short y, int start_roomnum, int *roomnum, int *facenum, int *lumel_num); +int FindLightmapFace(int16_t x, int16_t y, int start_roomnum, int *roomnum, int *facenum, int *lumel_num); // This is needed for small view cameras // It clears the facing array so that it is recomputed diff --git a/Descent3/room_external.h b/Descent3/room_external.h index b57c1a3d..2ac479a2 100644 --- a/Descent3/room_external.h +++ b/Descent3/room_external.h @@ -140,12 +140,12 @@ typedef struct face { uint8_t num_verts; // how many vertices in this face int8_t portal_num; // which portal this face is part of, or -1 if none - short *face_verts; // index into list of vertices for this face + int16_t *face_verts; // index into list of vertices for this face roomUVL *face_uvls; // index into list of uvls for this face vector normal; // the surface normal of this face - short tmap; // texture numbers for this face + int16_t tmap; // texture numbers for this face uint16_t lmi_handle; // the lightmap info number for this face - short special_handle; // the index into the special_faces array + int16_t special_handle; // the index into the special_faces array uint8_t renderframe; // what frame this face was last rendered (for lighting) uint8_t light_multiple; // what multiple to times by vector min_xyz, max_xyz; // min & max extents of this face (for FVI) @@ -163,10 +163,10 @@ typedef struct face { // a connection between two rooms typedef struct portal { int flags; // flags for this portal - short portal_face; // the face for this portal - short croom; // the room this portal connects to - short cportal; // the portal in croom this portal connects to - short bnode_index; + int16_t portal_face; // the face for this portal + int16_t croom; // the room this portal connects to + int16_t cportal; // the portal in croom this portal connects to + int16_t bnode_index; int combine_master; // For rendering combined portals vector path_pnt; // Point used by the path system } portal; @@ -229,32 +229,32 @@ typedef struct room { // Hierarchical bounding boxes for this room vector bbf_min_xyz; vector bbf_max_xyz; - short num_bbf_regions; - short pad1; - short **bbf_list; - short *num_bbf; + int16_t num_bbf_regions; + int16_t pad1; + int16_t **bbf_list; + int16_t *num_bbf; vector *bbf_list_min_xyz; vector *bbf_list_max_xyz; uint8_t *bbf_list_sector; bn_list bn_info; - short wpb_index; // world point buffer index - where this room starts + int16_t wpb_index; // world point buffer index - where this room starts uint8_t pulse_time; // each room can has a pulse time uint8_t pulse_offset; // each room has a timer offset for which it pulses vector wind; // Wind vector for the room int ambient_sound; // Index of ambient sound pattern for this room, or -1 if none - short vis_effects; // index of first visual effect in this room - short mirror_face; // Index of face that this room is to be mirrored by + int16_t vis_effects; // index of first visual effect in this room + int16_t mirror_face; // Index of face that this room is to be mirrored by uint8_t num_mirror_faces; // Number of faces in this room that have the same texture as the mirror uint16_t *mirror_faces_list; // the list of faces in this room that have the same texture as the mirror float damage; // The damage per second applied to players (& maybe others) in room vector path_pnt; // Point used by the path system uint8_t *volume_lights; // Pointer to memory for our volumetric lighting - short volume_width; // The dimensions of our volumetric room - short volume_height; - short volume_depth; + int16_t volume_width; // The dimensions of our volumetric room + int16_t volume_height; + int16_t volume_depth; float fog_depth; // How far until fog is totally opaque float fog_r, fog_g, fog_b; // Fog color diff --git a/Descent3/screens.cpp b/Descent3/screens.cpp index 58754893..af6c70f9 100644 --- a/Descent3/screens.cpp +++ b/Descent3/screens.cpp @@ -234,7 +234,7 @@ static struct { tLargeBitmap *bmp; } vis_list[2]; - short time_min, time_sec; + int16_t time_min, time_sec; float shield_rating, energy_rating; float accuracy_rating; } PLR; @@ -453,8 +453,8 @@ void SinglePlayerPostLevelResults() { int curline = 0; int j; - PLR.time_min = (short)Players[Player_num].time_level / 60.0f; - PLR.time_sec = (short)(Players[Player_num].time_level - ((float)PLR.time_min * 60.0f)); + PLR.time_min = (int16_t)Players[Player_num].time_level / 60.0f; + PLR.time_sec = (int16_t)(Players[Player_num].time_level - ((float)PLR.time_min * 60.0f)); PLR.shield_rating = Objects[Players[Player_num].objnum].shields; PLR.energy_rating = Players[Player_num].energy; if (Players[Player_num].num_discharges_level > 0) diff --git a/Descent3/terrain.cpp b/Descent3/terrain.cpp index a7c04dc7..5342692b 100644 --- a/Descent3/terrain.cpp +++ b/Descent3/terrain.cpp @@ -56,7 +56,7 @@ terrain_sky Terrain_sky; #if (!defined(RELEASE) || defined(NEWEDITOR)) // first object to render after cell has been rendered (only used for SW renderer) -short Terrain_seg_render_objs[TERRAIN_WIDTH * TERRAIN_DEPTH]; +int16_t Terrain_seg_render_objs[TERRAIN_WIDTH * TERRAIN_DEPTH]; #endif // Our lighting maps for the terrain, one for each quadrant (starting at lower left) @@ -797,7 +797,7 @@ void SetupSky(float radius, int flags, uint8_t randit) { int LoadPCXTerrain(char *filename) { CFILE *infile; int run = 0, i, total, j, n; - short xmin, ymin, xmax, ymax; + int16_t xmin, ymin, xmax, ymax; int width, height; uint8_t buf; uint8_t *lando; diff --git a/Descent3/terrain.h b/Descent3/terrain.h index 8792474f..c571feca 100644 --- a/Descent3/terrain.h +++ b/Descent3/terrain.h @@ -86,8 +86,8 @@ typedef struct { uint8_t l, r, g, b; - short objects; // Index of the first object in this cell - short texseg_index; // index into the tex_segment array + int16_t objects; // Index of the first object in this cell + int16_t texseg_index; // index into the tex_segment array uint8_t flags; // various flags uint8_t lm_quad; // which lightmap quad this index belongs to @@ -99,7 +99,7 @@ typedef struct { typedef struct { uint8_t rotation; - short tex_index; + int16_t tex_index; } terrain_tex_segment; // Data for LOD shutoff code @@ -117,7 +117,7 @@ typedef struct { float horizon_u[MAX_HORIZON_PIECES][5]; float horizon_v[MAX_HORIZON_PIECES][5]; - short dome_texture; + int16_t dome_texture; float radius; float rotate_rate; @@ -138,7 +138,7 @@ typedef struct { uint8_t num_satellites; uint8_t num_stars; - short satellite_texture[MAX_SATELLITES]; + int16_t satellite_texture[MAX_SATELLITES]; vector lightsource; angle lightangle; @@ -161,7 +161,7 @@ typedef struct { typedef struct { int terrain_seg; uint8_t num_segs; - short mine_segs[50]; + int16_t mine_segs[50]; } terrain_mine_list; typedef struct { @@ -209,7 +209,7 @@ extern terrain_segment Terrain_seg[TERRAIN_WIDTH * TERRAIN_DEPTH]; extern terrain_tex_segment Terrain_tex_seg[TERRAIN_TEX_WIDTH * TERRAIN_TEX_DEPTH]; // first object to render after cell has been rendered (only used for SW renderer) -extern short Terrain_seg_render_objs[]; +extern int16_t Terrain_seg_render_objs[]; #ifdef RELEASE #define TERRAIN_REGION(x) ((Terrain_seg[0x7FFFFFFF & x].flags & TFM_REGION_MASK) >> 5) diff --git a/Descent3/trigger.h b/Descent3/trigger.h index bc66738a..3343e260 100644 --- a/Descent3/trigger.h +++ b/Descent3/trigger.h @@ -117,8 +117,8 @@ typedef struct trigger { char name[TRIG_NAME_LEN + 1]; // the name of this trigger int roomnum; // the room this trigger is in int facenum; // the face to which this trigger is attched - short flags; // flags for this trigger - short activator; // flags for what can activate this trigger + int16_t flags; // flags for this trigger + int16_t activator; // flags for what can activate this trigger // This is allocated when the level is started tOSIRISTriggerScript osiris_script; } trigger; diff --git a/Descent3/vclip.cpp b/Descent3/vclip.cpp index 43960eaa..b393b1da 100644 --- a/Descent3/vclip.cpp +++ b/Descent3/vclip.cpp @@ -204,7 +204,7 @@ int AllocVClip() { for (i = 0; i < MAX_VCLIPS; i++) { if (GameVClips[i].used == 0) { memset(&GameVClips[i], 0, sizeof(vclip)); - GameVClips[i].frames = (short *)mem_malloc(VCLIP_MAX_FRAMES * sizeof(short)); + GameVClips[i].frames = (int16_t *)mem_malloc(VCLIP_MAX_FRAMES * sizeof(int16_t)); ASSERT(GameVClips[i].frames); GameVClips[i].frame_time = DEFAULT_FRAMETIME; GameVClips[i].flags = VCF_NOT_RESIDENT; diff --git a/Descent3/vclip.h b/Descent3/vclip.h index 450ac8ad..c8fc0ddb 100644 --- a/Descent3/vclip.h +++ b/Descent3/vclip.h @@ -32,8 +32,8 @@ typedef struct { char name[PAGENAME_LEN]; - short num_frames; - short *frames; // bitmap indices + int16_t num_frames; + int16_t *frames; // bitmap indices float frame_time; // time (in seconds) of each frame int flags; uint8_t target_size; // what size this vclip should use (texture wise) diff --git a/Descent3/viseffect.cpp b/Descent3/viseffect.cpp index 328cf9bf..38fe21cf 100644 --- a/Descent3/viseffect.cpp +++ b/Descent3/viseffect.cpp @@ -463,11 +463,11 @@ // DAJ vis_effect VisEffects[max_vis_effects]; // DAJ uint16_t VisDeadList[max_vis_effects]; -// DAJ static short Vis_free_list[max_vis_effects]; +// DAJ static int16_t Vis_free_list[max_vis_effects]; vis_effect *VisEffects = NULL; -static short *Vis_free_list = NULL; +static int16_t *Vis_free_list = NULL; uint16_t *VisDeadList = NULL; uint16_t max_vis_effects = 0; @@ -496,11 +496,11 @@ void InitVisEffects() { if (VisEffects != NULL) { VisEffects = (vis_effect *)mem_realloc(VisEffects, sizeof(vis_effect) * max_vis_effects); VisDeadList = (uint16_t *)mem_realloc(VisDeadList, sizeof(uint16_t) * max_vis_effects); - Vis_free_list = (short *)mem_realloc(Vis_free_list, sizeof(short) * max_vis_effects); + Vis_free_list = (int16_t *)mem_realloc(Vis_free_list, sizeof(int16_t) * max_vis_effects); } else if (VisEffects == NULL) { VisEffects = (vis_effect *)mem_malloc(sizeof(vis_effect) * max_vis_effects); VisDeadList = (uint16_t *)mem_malloc(sizeof(uint16_t) * max_vis_effects); - Vis_free_list = (short *)mem_malloc(sizeof(short) * max_vis_effects); + Vis_free_list = (int16_t *)mem_malloc(sizeof(int16_t) * max_vis_effects); } for (int i = 0; i < max_vis_effects; i++) { VisEffects[i].type = VIS_NONE; diff --git a/Descent3/viseffect_external.h b/Descent3/viseffect_external.h index 1d363198..e8e2e8ac 100644 --- a/Descent3/viseffect_external.h +++ b/Descent3/viseffect_external.h @@ -107,13 +107,13 @@ typedef struct { int phys_flags; - short custom_handle; + int16_t custom_handle; uint16_t lighting_color; uint16_t flags; - short next; - short prev; + int16_t next; + int16_t prev; vis_attach_info attach_info; axis_billboard_info billboard_info; diff --git a/Descent3/weapon.cpp b/Descent3/weapon.cpp index c8224c9d..d8852b7c 100644 --- a/Descent3/weapon.cpp +++ b/Descent3/weapon.cpp @@ -166,7 +166,7 @@ * added reset reticle when setting a new weapon. * * 46 4/24/98 8:02a Samir - * added a short weapon name array. + * added a int16_t weapon name array. * * 45 4/22/98 1:08p Chris * Fixed auto-firing of weapons after auto-selection diff --git a/Descent3/weapon.h b/Descent3/weapon.h index 7bdeb758..2a2896b4 100644 --- a/Descent3/weapon.h +++ b/Descent3/weapon.h @@ -156,7 +156,7 @@ * Added death_dot and bounce sound for weapons * * 46 4/24/98 8:02a Samir - * added a short weapon name array. + * added a int16_t weapon name array. * * 45 4/19/98 5:00p Jason * added cool napalm effect, plus made object effects dynamically @@ -270,17 +270,17 @@ typedef struct { float player_damage; // how much damage a full impact causes a player float generic_damage; // how much damage a full impact causes a robot float alpha; // What alpha to draw this weapon with - short sounds[MAX_WEAPON_SOUNDS]; // sounds for various things - short hud_image_handle; // a handle to a bitmap or vclip for the hud display - short fire_image_handle; // model or bitmap. Shown when you fire this weapon - short explode_image_handle; // exploding vclip - short smoke_handle; // smoke trail handle to texture - short spawn_handle; // weapon handle that gets spawned - short alternate_spawn_handle; // weapon handle that gets spawned (sometimes) - short robot_spawn_handle; // robot that gets spawned as a countermeasure - short particle_handle; // particle handle to texture - short icon_handle; - short scorch_handle; // handle for scorch bitmap, or -1 for none + int16_t sounds[MAX_WEAPON_SOUNDS]; // sounds for various things + int16_t hud_image_handle; // a handle to a bitmap or vclip for the hud display + int16_t fire_image_handle; // model or bitmap. Shown when you fire this weapon + int16_t explode_image_handle; // exploding vclip + int16_t smoke_handle; // smoke trail handle to texture + int16_t spawn_handle; // weapon handle that gets spawned + int16_t alternate_spawn_handle; // weapon handle that gets spawned (sometimes) + int16_t robot_spawn_handle; // robot that gets spawned as a countermeasure + int16_t particle_handle; // particle handle to texture + int16_t icon_handle; + int16_t scorch_handle; // handle for scorch bitmap, or -1 for none uint8_t spawn_count; // how many of spawn handle gets created uint8_t alternate_chance; // how often the alternate spawn weapon gets chosen (0 to 100) diff --git a/bitmap/iff.cpp b/bitmap/iff.cpp index f7305b4f..8bf29eb2 100644 --- a/bitmap/iff.cpp +++ b/bitmap/iff.cpp @@ -99,21 +99,21 @@ typedef struct { // structure of the header in the file typedef struct iff_bitmap_header { - short w, h; // width and height of this bitmap - short x, y; // generally unused - short type; // see types above - short transparentcolor; // which color is transparent (if any) - short pagewidth, pageheight; // width & height of source screen + int16_t w, h; // width and height of this bitmap + int16_t x, y; // generally unused + int16_t type; // see types above + int16_t transparentcolor; // which color is transparent (if any) + int16_t pagewidth, pageheight; // width & height of source screen uint8_t nplanes; // number of planes (8 for 256 color image) uint8_t masking, compression; // see constants above uint8_t xaspect, yaspect; // aspect ratio (usually 5/6) pal_entry palette[256]; // the palette for this bitmap uint8_t *raw_data; // ptr to array of data - short row_size; // offset to next row + int16_t row_size; // offset to next row } iff_bitmap_header; -short iff_transparent_color; -short iff_has_transparency; // 0=no transparency, 1=iff_transparent_color is valid +int16_t iff_transparent_color; +int16_t iff_has_transparency; // 0=no transparency, 1=iff_transparent_color is valid #define MIN(a, b) ((a < b) ? a : b) diff --git a/bitmap/tga.cpp b/bitmap/tga.cpp index bd567d5c..3b5a0e9e 100644 --- a/bitmap/tga.cpp +++ b/bitmap/tga.cpp @@ -153,7 +153,7 @@ static int Fake_file_size = 0; static inline char tga_read_byte(); static inline int tga_read_int(); -static inline short tga_read_short(); +static inline int16_t tga_read_short(); static uint16_t bm_tga_translate_pixel(int pixel, int format); static int bm_tga_read_outrage_compressed16(CFILE *infile, int n, int num_mips, int type); @@ -180,8 +180,8 @@ inline int tga_read_int() { return INTEL_INT(i); } -inline short tga_read_short() { - short i; +inline int16_t tga_read_short() { + int16_t i; // Check for bad file if (Fake_pos + 2 > Fake_file_size) { @@ -189,7 +189,7 @@ inline short tga_read_short() { return 0; } - i = *(short *)(Tga_file_data + Fake_pos); + i = *(int16_t *)(Tga_file_data + Fake_pos); Fake_pos += 2; return INTEL_SHORT(i); diff --git a/cfile/cfile.cpp b/cfile/cfile.cpp index 93ca193c..abc3ff5e 100644 --- a/cfile/cfile.cpp +++ b/cfile/cfile.cpp @@ -915,7 +915,7 @@ int32_t cf_ReadInt(CFILE *cfp) { cf_ReadBytes((uint8_t *)&i, sizeof(i), cfp); return INTEL_INT(i); } -// Read and return a short (16 bits) +// Read and return a int16_t (16 bits) // Throws an exception of type (cfile_error *) if the OS returns an error on read int16_t cf_ReadShort(CFILE *cfp) { int16_t i; @@ -1029,10 +1029,10 @@ void cf_WriteInt(CFILE *cfp, int32_t i) { cf_WriteBytes((uint8_t *)&t, sizeof(t), cfp); } -// Write a short (16 bits) +// Write a int16_t (16 bits) // Throws an exception of type (cfile_error *) if the OS returns an error on write void cf_WriteShort(CFILE *cfp, int16_t s) { - short t = INTEL_SHORT(s); + int16_t t = INTEL_SHORT(s); cf_WriteBytes((uint8_t *)&t, sizeof(t), cfp); } diff --git a/cfile/cfile.h b/cfile/cfile.h index 7f6d746b..7090e068 100644 --- a/cfile/cfile.h +++ b/cfile/cfile.h @@ -229,7 +229,7 @@ int cf_ReadBytes(uint8_t *buf, int count, CFILE *cfp); // Throws an exception of type (cfile_error *) if the OS returns an error on read int32_t cf_ReadInt(CFILE *cfp); -// Read and return a short (16 bits) +// Read and return a int16_t (16 bits) // Throws an exception of type (cfile_error *) if the OS returns an error on read int16_t cf_ReadShort(CFILE *cfp); @@ -283,7 +283,7 @@ int cfprintf(CFILE *cfp, const char *format, ...); // Throws an exception of type (cfile_error *) if the OS returns an error on write void cf_WriteInt(CFILE *cfp, int32_t i); -// Write a short (16 bits) +// Write a int16_t (16 bits) // Throws an exception of type (cfile_error *) if the OS returns an error on write void cf_WriteShort(CFILE *cfp, int16_t s); diff --git a/d3music/musicapi.cpp b/d3music/musicapi.cpp index f7b71790..5d06cac1 100644 --- a/d3music/musicapi.cpp +++ b/d3music/musicapi.cpp @@ -61,7 +61,7 @@ static struct { int cur_song; // current song int n_hostiles; // number of hostiles ai thinks there are. tMusicVal trigger; - short pending_region; // pending region change. + int16_t pending_region; // pending region change. bool was_toggled_on; // music was turned on by user. bool immediate_switch; // force switch immediately for regions bool restart_sequencer; // restarts sequencer next frame. @@ -273,7 +273,7 @@ void D3MusicAI(tMusicSeqInfo *music_info) { //@@// if no hostiles and mood != mood_default, then modify mood until it equals 0 again. do it every second. //@@ if (MusicAI.mood != MusicAI.mood_default) { - //@@ short mod = (MusicAI.flags & MUSICAIF_HOSTILES) ? 1 : 2; + //@@ int16_t mod = (MusicAI.flags & MUSICAIF_HOSTILES) ? 1 : 2; //@@ float time_mod = (MusicAI.flags & MUSICAIF_HOSTILES) ? 0.2f : 0.2f; //@@ if (MusicAI.mood_timer >= time_mod) { //@@ if (MusicAI.mood > MusicAI.mood_default) { @@ -414,7 +414,7 @@ void D3MusicSongSelector() { } // set music region -void D3MusicSetRegion(short region, bool immediate) { +void D3MusicSetRegion(int16_t region, bool immediate) { if (Music_seq.GetCurrentRegion() != region) { MusicAI.immediate_switch = immediate; MusicAI.pending_region = region; @@ -427,10 +427,10 @@ void D3MusicSetRegion(short region, bool immediate) { } // retreives current region -short D3MusicGetRegion() { return Music_seq.GetPlayingRegion(); } +int16_t D3MusicGetRegion() { return Music_seq.GetPlayingRegion(); } // retreives current PLAYING region. -short D3MusicGetPendingRegion() { return MusicAI.pending_region; } +int16_t D3MusicGetPendingRegion() { return MusicAI.pending_region; } // starts special in-game cinematic music void D3MusicStartCinematic() {} diff --git a/ddebug/winmono.cpp b/ddebug/winmono.cpp index 7de960fc..be7fefde 100644 --- a/ddebug/winmono.cpp +++ b/ddebug/winmono.cpp @@ -75,13 +75,13 @@ typedef struct mono_element { } mono_element; typedef struct { - short first_row; - short height; - short first_col; - short width; - short cursor_row; - short cursor_col; - short open; + int16_t first_row; + int16_t height; + int16_t first_col; + int16_t width; + int16_t cursor_row; + int16_t cursor_col; + int16_t open; struct mono_element save_buf[25][80]; struct mono_element text[25][80]; } WINDOW; @@ -500,7 +500,7 @@ void con_mputc(int n, char c) { con_setcursor(ROW + CROW, COL + CCOL); } -void copy_row(int nwords, short *src, short *dest1, short *dest2) { +void copy_row(int nwords, int16_t *src, int16_t *dest1, int16_t *dest2) { // TODO: disabled for now to get the x64 build compiling // do we even need all this old 'mono' stuff anymore? #ifndef _WIN64 @@ -541,7 +541,7 @@ void con_scroll(int n) { col = 0; for (row = 0; row < (HEIGHT - 1); row++) - copy_row(WIDTH, (short *)&XCHAR(row + 1, col), (short *)&CHAR(row, col), (short *)&XCHAR(row, col)); + copy_row(WIDTH, (int16_t *)&XCHAR(row + 1, col), (int16_t *)&CHAR(row, col), (int16_t *)&XCHAR(row, col)); // for ( col = 0; col < WIDTH; col++ ) // { @@ -574,7 +574,7 @@ void con_setcursor(int row, int col) { } void con_drawbox(int n) { - short row, col; + int16_t row, col; if (!OPEN) return; @@ -609,7 +609,7 @@ void con_drawbox(int n) { } void con_clear(int n) { - short row, col; + int16_t row, col; if (!OPEN) return; diff --git a/ddio_common/key.cpp b/ddio_common/key.cpp index ecd13928..0dc3bdd0 100644 --- a/ddio_common/key.cpp +++ b/ddio_common/key.cpp @@ -145,7 +145,7 @@ static bool DDIO_key_init = 0; volatile uint8_t DDIO_key_state[DDIO_MAX_KEYS]; -volatile short DDIO_key_down_count[DDIO_MAX_KEYS]; +volatile int16_t DDIO_key_down_count[DDIO_MAX_KEYS]; static struct t_key_queue { uint16_t buffer[KEY_QUEUE_SIZE]; // Keyboard buffer queue diff --git a/ddio_lnx/lnxforcefeedback.cpp b/ddio_lnx/lnxforcefeedback.cpp index 56277b14..559b0c48 100644 --- a/ddio_lnx/lnxforcefeedback.cpp +++ b/ddio_lnx/lnxforcefeedback.cpp @@ -224,14 +224,14 @@ void ddio_ffb_DestroyAll(void) {} // Purpose: // Play an effect that was previously created. // ------------------------------------------------------------------- -void ddio_ffb_effectPlay(short) {} +void ddio_ffb_effectPlay(int16_t) {} // ------------------------------------------------------------------- // ddio_ffb_effectStop // Purpose: // Stop a single effect. // ------------------------------------------------------------------- -void ddio_ffb_effectStop(short) {} +void ddio_ffb_effectStop(int16_t) {} // ------------------------------------------------------------------- // ddio_ffb_effectStopAll @@ -246,7 +246,7 @@ void ddio_ffb_effectStopAll(tDevice) {} // Unload a single effect... Necessary to make room for other // effects. // ------------------------------------------------------------------- -void ddio_ffb_effectUnload(short) {} +void ddio_ffb_effectUnload(int16_t) {} // ------------------------------------------------------------------- // ddio_ffb_effectModify @@ -254,14 +254,14 @@ void ddio_ffb_effectUnload(short) {} // Modifies a single effect, only if the given parameters are // different from what's currently loaded. // ------------------------------------------------------------------- -void ddio_ffb_effectModify(short, int *, uint32_t *, uint32_t *, uint32_t *, tEffInfo *, tEffEnvelope *) {} +void ddio_ffb_effectModify(int16_t, int *, uint32_t *, uint32_t *, uint32_t *, tEffInfo *, tEffEnvelope *) {} // ------------------------------------------------------------------- // ddio_ffb_GetEffectData // Purpose: // Retrieves affect data for the given parameters, pass NULL for those you don't want // ------------------------------------------------------------------- -void ddio_ffb_GetEffectData(short, int *, uint32_t *, uint32_t *, uint32_t *, tEffInfo *, tEffEnvelope *) {} +void ddio_ffb_GetEffectData(int16_t, int *, uint32_t *, uint32_t *, uint32_t *, tEffInfo *, tEffEnvelope *) {} // ------------------------------------------------------------------- // ddio_ffjoy_EnableAutoCenter diff --git a/ddio_lnx/lnxmouse.cpp b/ddio_lnx/lnxmouse.cpp index 68cc827b..76dd8354 100644 --- a/ddio_lnx/lnxmouse.cpp +++ b/ddio_lnx/lnxmouse.cpp @@ -112,8 +112,8 @@ typedef struct t_mse_button_info { } t_mse_button_info; typedef struct t_mse_event { - short btn; - short state; + int16_t btn; + int16_t state; } t_mse_event; static t_mse_button_info DIM_buttons; diff --git a/ddio_win/winforcefeedback.cpp b/ddio_win/winforcefeedback.cpp index fd193ee1..e3ecacf8 100644 --- a/ddio_win/winforcefeedback.cpp +++ b/ddio_win/winforcefeedback.cpp @@ -965,7 +965,7 @@ int ddio_ffb_effectCreate(tDevice dev, tFFB_Effect* eff) // Purpose: // Play an effect that was previously created. // ------------------------------------------------------------------- -void ddio_ffb_effectPlay(short eID) +void ddio_ffb_effectPlay(int16_t eID) { if(eID<0 || eID>=DDIO_FF_MAXEFFECTS){ Int3(); //invalid eID @@ -993,7 +993,7 @@ ff_try: // Purpose: // Stop a single effect. // ------------------------------------------------------------------- -void ddio_ffb_effectStop(short eID) +void ddio_ffb_effectStop(int16_t eID) { if(eID<0 || eID>=DDIO_FF_MAXEFFECTS){ Int3(); //invalid eID @@ -1020,7 +1020,7 @@ void ddio_ffb_effectStopAll(tDevice dev) // Unload a single effect... Necessary to make room for other // effects. // ------------------------------------------------------------------- -void ddio_ffb_effectUnload(short eID) +void ddio_ffb_effectUnload(int16_t eID) { if(eID<0 || eID>=DDIO_FF_MAXEFFECTS){ Int3(); //invalid eID @@ -1036,7 +1036,7 @@ void ddio_ffb_effectUnload(short eID) // Modifies a single effect, only if the given parameters are // different from what's currently loaded. // ------------------------------------------------------------------- -void ddio_ffb_effectModify(short eID, int* Direction, uint32_t* Duration, uint32_t* Gain, uint32_t* Period, tEffInfo* TypeInfo, tEffEnvelope* Envelope) +void ddio_ffb_effectModify(int16_t eID, int* Direction, uint32_t* Duration, uint32_t* Gain, uint32_t* Period, tEffInfo* TypeInfo, tEffEnvelope* Envelope) { uint32_t flags = 0; @@ -1101,7 +1101,7 @@ void ddio_ffb_effectModify(short eID, int* Direction, uint32_t* Duration, uint32 // Purpose: // Retrieves affect data for the given parameters, pass NULL for those you don't want // ------------------------------------------------------------------- -void ddio_ffb_GetEffectData(short eID, int* Direction, uint32_t* Duration, uint32_t* Gain, uint32_t* Period, tEffInfo* TypeInfo, tEffEnvelope* Envelope) +void ddio_ffb_GetEffectData(int16_t eID, int* Direction, uint32_t* Duration, uint32_t* Gain, uint32_t* Period, tEffInfo* TypeInfo, tEffEnvelope* Envelope) { if (Direction){ *Direction = ddEffect[eID].direction[0]; @@ -1498,9 +1498,9 @@ bool ddio_ffjoy_SupportAutoCenter(tDevice dev) { return false; } void ddio_ffb_DestroyAll(void) {} -void ddio_ffb_effectPlay(short eID) {} +void ddio_ffb_effectPlay(int16_t eID) {} -void ddio_ffb_effectModify(short eID, int *Direction, uint32_t *Duration, uint32_t *Gain, uint32_t *Period, +void ddio_ffb_effectModify(int16_t eID, int *Direction, uint32_t *Duration, uint32_t *Gain, uint32_t *Period, tEffInfo *TypeInfo, tEffEnvelope *Envelope) {} int ddio_ffb_effectCreate(tDevice dev, tFFB_Effect *eff) { return -1; } diff --git a/ddio_win/winjoy.cpp b/ddio_win/winjoy.cpp index 14f77c2f..137c68a3 100644 --- a/ddio_win/winjoy.cpp +++ b/ddio_win/winjoy.cpp @@ -116,7 +116,7 @@ typedef struct tJoystickRecord { uint8_t valid; // is this a valid device. uint8_t flags; // defined in ddio_win.h - short spad; + int16_t spad; union { int joyid; @@ -129,8 +129,8 @@ typedef struct tJoystickRecord { ////////////////////////////////////////////////////////////////////////////// static struct tJoystickLibraryData { - short init; // library initialized? - short njoy; // maximum number of joysticks supported. + int16_t init; // library initialized? + int16_t njoy; // maximum number of joysticks supported. tJoystickRecord *joystick; // list of joysticks. LPDIRECTINPUT lpdi; // if lpdi != NULL, we use direct input for joysticks diff --git a/ddio_win/winmouse.cpp b/ddio_win/winmouse.cpp index a8ecfd93..61a3257f 100644 --- a/ddio_win/winmouse.cpp +++ b/ddio_win/winmouse.cpp @@ -40,8 +40,8 @@ typedef struct t_mse_button_info { } t_mse_button_info; typedef struct t_mse_event { - short btn; - short state; + int16_t btn; + int16_t state; } t_mse_event; #define MOUSE_ZMIN 0 // mouse wheel z min and max (increments of 120 = 10 units) @@ -67,9 +67,9 @@ static bool DDIO_mouse_init = 0; static struct mses_state { LPDIRECTINPUTDEVICE lpdimse; RECT brect; // limit rectangle of absolute mouse coords - short x, y, z; // current x,y,z in absolute mouse coords - short cx, cy, cz; // prior values of x,y,z from last mouse frame - short zmin, zmax; // 3 dimensional mouse devices use this + int16_t x, y, z; // current x,y,z in absolute mouse coords + int16_t cx, cy, cz; // prior values of x,y,z from last mouse frame + int16_t zmin, zmax; // 3 dimensional mouse devices use this int btn_mask, btn_flags; // btn_flags are the avaiable buttons on this device in mask form. float timer; // done to keep track of mouse polling. [ISB] this is in InjectD3 but not here? bool emulated; // are we emulating direct input? @@ -78,9 +78,9 @@ static struct mses_state { int8_t cursor_count; float x_aspect, y_aspect; // used in calculating coordinates returned from ddio_MouseGetState HANDLE hmseevt; // signaled if mouse input is awaiting. - short dx, dy, dz, imm_dz; - short mode; // mode of mouse operation. - short nbtns, naxis; // device caps. + int16_t dx, dy, dz, imm_dz; + int16_t mode; // mode of mouse operation. + int16_t nbtns, naxis; // device caps. } DDIO_mouse_state; // Normally mouse events use ticks, attempting to use timer_GetTime which has more accuracy to smooth over bug with @@ -368,7 +368,7 @@ int RawInputHandler(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) { } if (buttons & RI_MOUSE_WHEEL) { - wheelAccum += (int)(short)rawinput->data.mouse.usButtonData; + wheelAccum += (int)(int16_t)rawinput->data.mouse.usButtonData; if (wheelAccum >= WHEEL_DELTA) { DIM_buttons.down_count[MSEBTN_WHL_UP]++; DIM_buttons.up_count[MSEBTN_WHL_UP]++; @@ -401,17 +401,17 @@ int RawInputHandler(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) { // check bounds of mouse cursor. if (DDIO_mouse_state.x < DDIO_mouse_state.brect.left) - DDIO_mouse_state.x = (short)DDIO_mouse_state.brect.left; + DDIO_mouse_state.x = (int16_t)DDIO_mouse_state.brect.left; if (DDIO_mouse_state.x >= DDIO_mouse_state.brect.right) - DDIO_mouse_state.x = (short)DDIO_mouse_state.brect.right - 1; + DDIO_mouse_state.x = (int16_t)DDIO_mouse_state.brect.right - 1; if (DDIO_mouse_state.y < DDIO_mouse_state.brect.top) - DDIO_mouse_state.y = (short)DDIO_mouse_state.brect.top; + DDIO_mouse_state.y = (int16_t)DDIO_mouse_state.brect.top; if (DDIO_mouse_state.y >= DDIO_mouse_state.brect.bottom) - DDIO_mouse_state.y = (short)DDIO_mouse_state.brect.bottom - 1; + DDIO_mouse_state.y = (int16_t)DDIO_mouse_state.brect.bottom - 1; if (DDIO_mouse_state.z > DDIO_mouse_state.zmax) - DDIO_mouse_state.z = (short)DDIO_mouse_state.zmax; + DDIO_mouse_state.z = (int16_t)DDIO_mouse_state.zmax; if (DDIO_mouse_state.z < DDIO_mouse_state.zmin) - DDIO_mouse_state.z = (short)DDIO_mouse_state.zmin; + DDIO_mouse_state.z = (int16_t)DDIO_mouse_state.zmin; } free(buf); diff --git a/grtext/grfont.cpp b/grtext/grfont.cpp index a1fcc71b..8733f1a9 100644 --- a/grtext/grfont.cpp +++ b/grtext/grfont.cpp @@ -157,7 +157,7 @@ static bool Font_init = false; typedef CFILE *FONTFILE; static inline int READ_FONT_INT(FONTFILE ffile); -static inline short READ_FONT_SHORT(FONTFILE ffile); +static inline int16_t READ_FONT_SHORT(FONTFILE ffile); static inline uint8_t READ_FONT_BYTE(FONTFILE ffile); static inline int READ_FONT_DATA(FONTFILE ffile, void *buf, int size, int nelem); static inline FONTFILE OPEN_FONT(char *filename); @@ -165,7 +165,7 @@ static inline void CLOSE_FONT(FONTFILE ffile); inline int READ_FONT_INT(FONTFILE ffile) { return cf_ReadInt(ffile); } -inline short READ_FONT_SHORT(FONTFILE ffile) { return cf_ReadShort(ffile); } +inline int16_t READ_FONT_SHORT(FONTFILE ffile) { return cf_ReadShort(ffile); } inline uint8_t READ_FONT_BYTE(FONTFILE ffile) { return (uint8_t)cf_ReadByte(ffile); } @@ -199,7 +199,7 @@ inline void CLOSE_FONT(FONTFILE ffile) { cfclose(ffile); } typedef FILE *FONTFILE2; static inline int WRITE_FONT_INT(FONTFILE2 ffile, int i); -static inline int WRITE_FONT_SHORT(FONTFILE2 ffile, short s); +static inline int WRITE_FONT_SHORT(FONTFILE2 ffile, int16_t s); static inline int WRITE_FONT_BYTE(FONTFILE2 ffile, uint8_t c); static inline int WRITE_FONT_DATA(FONTFILE2 ffile, void *buf, int size, int nelem); static inline FONTFILE2 OPEN_FONT2(char *filename); @@ -207,7 +207,7 @@ static inline void CLOSE_FONT2(FONTFILE2 ffile); inline int WRITE_FONT_INT(FONTFILE2 ffile, int i) { return fwrite(&i, sizeof(i), 1, (FILE *)ffile); } -inline int WRITE_FONT_SHORT(FONTFILE2 ffile, short s) { return fwrite(&s, sizeof(s), 1, (FILE *)ffile); } +inline int WRITE_FONT_SHORT(FONTFILE2 ffile, int16_t s) { return fwrite(&s, sizeof(s), 1, (FILE *)ffile); } inline int WRITE_FONT_BYTE(FONTFILE2 ffile, uint8_t c) { return fwrite(&c, sizeof(c), 1, (FILE *)ffile); } @@ -456,7 +456,7 @@ void grfont_Free(int handle) { bool grfont_LoadTemplate(const char *fname, tFontTemplate *ft) { FONTFILE ff; char fontname[32]; - short ft_width, ft_height, ft_flags, ft_minasc, ft_maxasc, num_char, i; + int16_t ft_width, ft_height, ft_flags, ft_minasc, ft_maxasc, num_char, i; tFontFileInfo2 ffi2; // open file. @@ -647,7 +647,7 @@ bool grfont_SetTemplate(const char *pathname, const tFontTemplate *ft) { WRITE_FONT_DATA(ffout, tempstr, 32, 1); if (fnt.flags & FT_FFI2) { - WRITE_FONT_SHORT(ffout, (short)ft->ch_tracking); + WRITE_FONT_SHORT(ffout, (int16_t)ft->ch_tracking); WRITE_FONT_DATA(ffout, ffi2.reserved, sizeof(ffi2.reserved), 1); } @@ -656,7 +656,7 @@ bool grfont_SetTemplate(const char *pathname, const tFontTemplate *ft) { // Write widths now if necessary.(FT_PROPORTIONAL) if (fnt.flags & FT_PROPORTIONAL) { for (int i = 0; i < num_char; i++) - WRITE_FONT_SHORT(ffout, (short)fnt.char_widths[i]); + WRITE_FONT_SHORT(ffout, (int16_t)fnt.char_widths[i]); } if (fnt.flags & FT_KERNED) { @@ -669,7 +669,7 @@ bool grfont_SetTemplate(const char *pathname, const tFontTemplate *ft) { ASSERT((n_bytes % 3) == 0); n_pairs = n_bytes / 3; - WRITE_FONT_SHORT(ffout, (short)n_pairs); + WRITE_FONT_SHORT(ffout, (int16_t)n_pairs); for (i = 0; i < n_pairs; i++) { WRITE_FONT_BYTE(ffout, ch[i * 3]); @@ -729,7 +729,7 @@ bool grfont_SetTracking(int font, int tracking) { tFontInfo *oldft = &Fonts[font]; - oldft->font.ffi2.tracking = (short)tracking; + oldft->font.ffi2.tracking = (int16_t)tracking; return false; } diff --git a/grtext/grtext.cpp b/grtext/grtext.cpp index bcfb3dd0..bcc8de0d 100644 --- a/grtext/grtext.cpp +++ b/grtext/grtext.cpp @@ -446,20 +446,20 @@ void grtext_CenteredPrintf(int xoff, int y, const char *fmt, ...) { void grtext_Puts(int x, int y, const char *str) { struct { char op; - short x, y; + int16_t x, y; } cmd; ASSERT((Grtext_ptr + sizeof(cmd) + strlen(str) + 1) < GRTEXT_BUFLEN); cmd.op = GRTEXTOP_PUTS; - cmd.x = (short)x; - cmd.y = (short)y; + cmd.x = (int16_t)x; + cmd.y = (int16_t)y; ASSERT((Grtext_ptr + sizeof(cmd) + strlen(str) + 1) < GRTEXT_BUFLEN); cmd.op = GRTEXTOP_PUTS; - cmd.x = (short)x; - cmd.y = (short)y; + cmd.x = (int16_t)x; + cmd.y = (int16_t)y; memcpy(&Grtext_buffer[Grtext_ptr], &cmd, sizeof(cmd)); Grtext_ptr += sizeof(cmd); strcpy(&Grtext_buffer[Grtext_ptr], str); @@ -502,15 +502,15 @@ void grtext_Puts(int x, int y, const char *str) { void grtext_PutChar(int x, int y, int ch) { struct { char op; - short x, y; + int16_t x, y; uint8_t ch; } cmd; ASSERT((Grtext_ptr + sizeof(cmd)) < GRTEXT_BUFLEN); cmd.op = GRTEXTOP_PUTCHAR; - cmd.x = (short)x; - cmd.y = (short)y; + cmd.x = (int16_t)x; + cmd.y = (int16_t)y; cmd.ch = (uint8_t)ch; memcpy(&Grtext_buffer[Grtext_ptr], &cmd, sizeof(cmd)); Grtext_ptr += sizeof(cmd); @@ -618,7 +618,7 @@ void grtext_Render() { case GRTEXTOP_PUTS: { struct { char op; - short x, y; + int16_t x, y; } cmd; memcpy(&cmd, &Grtext_buffer[pos], sizeof(cmd)); @@ -638,7 +638,7 @@ void grtext_Render() { tCharBlt cbi; struct { char op; - short x, y; + int16_t x, y; uint8_t ch; } cmd; diff --git a/legacy/D3Launch/UpdateDlg.cpp b/legacy/D3Launch/UpdateDlg.cpp index 1b027eba..1f989390 100644 --- a/legacy/D3Launch/UpdateDlg.cpp +++ b/legacy/D3Launch/UpdateDlg.cpp @@ -970,7 +970,7 @@ BOOL CUpdateDlg::ApplyPatch() sprintf(patch_cmd_line,"-undo %s",PATCH_LOC_FNAME); RTPatchApply32 = (uint32_t (__stdcall *)(char *,void *(__stdcall *)(uint32_t,void *),int))GetProcAddress(patchlib, "RTPatchApply32@12"); if (RTPatchApply32) { - m_progress.SetRange(0,short(0x8000)); + m_progress.SetRange(0,int16_t(0x8000)); m_progress.SetPos(0); dlg = this; StatusBar(IDS_UPDATEDLG_BEG_PATCH); diff --git a/legacy/FontEditor/FontCreate.cpp b/legacy/FontEditor/FontCreate.cpp index c8e4c596..3f070971 100644 --- a/legacy/FontEditor/FontCreate.cpp +++ b/legacy/FontEditor/FontCreate.cpp @@ -61,7 +61,7 @@ inline int WRITE_FONT_INT(FONTFILE ffile, int i) { return fwrite(&i, sizeof(i), 1, (FILE *)ffile); } -inline int WRITE_FONT_SHORT(FONTFILE ffile, short s) { +inline int WRITE_FONT_SHORT(FONTFILE ffile, int16_t s) { return fwrite(&s, sizeof(s), 1, (FILE *)ffile); } @@ -152,8 +152,8 @@ void message_box(const char *fmt, ...) static bool m_FontProp; static uint8_t m_CharWidths[MAX_FONT_CHARS]; -static short m_CharHeight; -static short m_CharMaxWidth; +static int16_t m_CharHeight; +static int16_t m_CharMaxWidth; static uint16_t *m_FontBmData; static uint16_t *m_DataBuffer, *m_DataPtr; static int m_FontType; @@ -430,7 +430,7 @@ void FontCreate(const char *fnt_file_source, const char *fnt_file_dest, int min_ WRITE_FONT_BYTE(ffile, ft.max_ascii); WRITE_FONT_DATA(ffile, fontname, 32, 1); - WRITE_FONT_SHORT(ffile, (short)ft.ffi2.tracking); + WRITE_FONT_SHORT(ffile, (int16_t)ft.ffi2.tracking); WRITE_FONT_DATA(ffile, ft.ffi2.reserved, sizeof(ft.ffi2.reserved),1); num_char = (int)(ft.max_ascii - ft.min_ascii + 1); diff --git a/legacy/FontEditor/FontKern.cpp b/legacy/FontEditor/FontKern.cpp index 7938416a..a4e5f070 100644 --- a/legacy/FontEditor/FontKern.cpp +++ b/legacy/FontEditor/FontKern.cpp @@ -194,7 +194,7 @@ void FontKern(const char *fnt_file_name) int current_item = 0; int num_items_displayed = 1; bool done = false; - short text_alpha=255; + int16_t text_alpha=255; int red_comp , green_comp, blue_comp; ddgr_color text_color; diff --git a/legacy/editor/DallasMainDlg.cpp b/legacy/editor/DallasMainDlg.cpp index 060f2217..5cfc320b 100644 --- a/legacy/editor/DallasMainDlg.cpp +++ b/legacy/editor/DallasMainDlg.cpp @@ -9648,7 +9648,7 @@ int CDallasMainDlg::CreateScriptFile(char *filename) O(("int STDCALL GetGOScriptID(const char *name,uint8_t is_door);")); O(("void STDCALLPTR CreateInstance(int id);")); O(("void STDCALL DestroyInstance(int id,void *ptr);")); - O(("short STDCALL CallInstanceEvent(int id,void *ptr,int event,tOSIRISEventInfo *data);")); + O(("int16_t STDCALL CallInstanceEvent(int id,void *ptr,int event,tOSIRISEventInfo *data);")); O(("int STDCALL GetTriggerScriptID(int trigger_room, int trigger_face );")); O(("int STDCALL GetCOScriptList( int **list, int **id_list );")); O(("int STDCALL SaveRestoreState( void *file_ptr, uint8_t saving_state );")); @@ -9692,14 +9692,14 @@ int CDallasMainDlg::CreateScriptFile(char *filename) O(("public:")); O((" BaseScript();")); O((" ~BaseScript();")); - O((" virtual short CallEvent(int event, tOSIRISEventInfo *data);")); + O((" virtual int16_t CallEvent(int event, tOSIRISEventInfo *data);")); O(("};")); O(("")); // Write out the level script class definition O(("class %s : public BaseScript {",LEVEL_CLASS_NAME)); O(("public:")); - O((" short CallEvent(int event, tOSIRISEventInfo *data);")); + O((" int16_t CallEvent(int event, tOSIRISEventInfo *data);")); O(("};")); O(("")); @@ -9708,7 +9708,7 @@ int CDallasMainDlg::CreateScriptFile(char *filename) if(m_ScriptGroupingList[j].owner_type==OBJECT_TYPE) { O(("class %s : public BaseScript {",CreateScriptClassName(j))); O(("public:")); - O((" short CallEvent(int event, tOSIRISEventInfo *data);")); + O((" int16_t CallEvent(int event, tOSIRISEventInfo *data);")); O(("};")); O(("")); } @@ -9718,7 +9718,7 @@ int CDallasMainDlg::CreateScriptFile(char *filename) if(m_ScriptGroupingList[j].owner_type==TRIGGER_TYPE) { O(("class %s : public BaseScript {",CreateScriptClassName(j))); O(("public:")); - O((" short CallEvent(int event, tOSIRISEventInfo *data);")); + O((" int16_t CallEvent(int event, tOSIRISEventInfo *data);")); O(("};")); O(("")); } @@ -10141,7 +10141,7 @@ int CDallasMainDlg::CreateScriptFile(char *filename) O(("// ===================")); O(("// CallInstanceEvent()")); O(("// ===================")); - O(("short STDCALL CallInstanceEvent(int id,void *ptr,int event,tOSIRISEventInfo *data)")); + O(("int16_t STDCALL CallInstanceEvent(int id,void *ptr,int event,tOSIRISEventInfo *data)")); O(("{")); O((" switch(id) {")); @@ -10282,7 +10282,7 @@ int CDallasMainDlg::CreateScriptFile(char *filename) O(("}")); O(("")); - O(("short BaseScript::CallEvent(int event,tOSIRISEventInfo *data)")); + O(("int16_t BaseScript::CallEvent(int event,tOSIRISEventInfo *data)")); O(("{")); O((" mprintf(0,\"BaseScript::CallEvent()\\n\");")); O((" return CONTINUE_CHAIN|CONTINUE_DEFAULT;")); @@ -10290,7 +10290,7 @@ int CDallasMainDlg::CreateScriptFile(char *filename) O(("")); // Create the Level Script Class' CallEvent() method - O(("short %s::CallEvent(int event,tOSIRISEventInfo *data)",LEVEL_CLASS_NAME)); + O(("int16_t %s::CallEvent(int event,tOSIRISEventInfo *data)",LEVEL_CLASS_NAME)); O(("{")); O((" switch(event) { ")); @@ -10311,7 +10311,7 @@ int CDallasMainDlg::CreateScriptFile(char *filename) // Create the CallEvent() methods for each custom object script class for(j=0;jfaces[i].num_verts=cf_ReadInt (infile); - //rp->faces[i].face_verts=(short *)mem_malloc (sizeof(short)*rp->faces[i].num_verts); + //rp->faces[i].face_verts=(int16_t *)mem_malloc (sizeof(int16_t)*rp->faces[i].num_verts); //rp->faces[i].face_uvls=(g3UVL *)mem_malloc (sizeof(g3UVL)*rp->faces[i].num_verts); InitRoomFace(&rp->faces[i],nverts); @@ -1160,7 +1160,7 @@ void GetIJ(const vector *normal,int *ii,int *jj); // If the face is convex, returns -1 //NOTE: A face could have multiple concavities, and this will only find the one with the //lowest-numbered vertex -int CheckFaceConcavity(int num_verts,short *face_verts,vector *normal,vector *verts) +int CheckFaceConcavity(int num_verts,int16_t *face_verts,vector *normal,vector *verts) { int ii,jj; float i0,j0,i1,j1; @@ -1252,7 +1252,7 @@ void CopyFace(face *dfp,face *sfp) //Checks to see if a face is planar. //See if all the points are within a certain distance of an average point //Returns 1 if face is planar, 0 if not -bool FaceIsPlanar(int nv,short *face_verts,vector *normal,vector *verts) +bool FaceIsPlanar(int nv,int16_t *face_verts,vector *normal,vector *verts) { //Triangles are always planar if (nv == 3) @@ -1315,7 +1315,7 @@ void FixConcaveFaces (room *rp,int *facelist,int facecount) { int nverts=rp->faces[t].num_verts; - newfaces[t].face_verts = (short *) mem_malloc(nverts * sizeof(short)); + newfaces[t].face_verts = (int16_t *) mem_malloc(nverts * sizeof(int16_t)); ASSERT(newfaces[t].face_verts != NULL); newfaces[t].face_uvls = (roomUVL *) mem_malloc(nverts * sizeof(roomUVL)); ASSERT(newfaces[t].face_uvls != NULL); @@ -1337,7 +1337,7 @@ void FixConcaveFaces (room *rp,int *facelist,int facecount) { int nverts=3; - newfaces[t].face_verts = (short *) mem_malloc(nverts * sizeof(short)); + newfaces[t].face_verts = (int16_t *) mem_malloc(nverts * sizeof(int16_t)); ASSERT(newfaces[t].face_verts != NULL); newfaces[t].face_uvls = (roomUVL *) mem_malloc(nverts * sizeof(roomUVL)); ASSERT(newfaces[t].face_uvls != NULL); @@ -1418,7 +1418,7 @@ void ReInitRoomFace(face *fp,int nverts) mem_free(fp->face_verts); mem_free(fp->face_uvls); - fp->face_verts = (short *) mem_malloc(nverts * sizeof(*fp->face_verts)); ASSERT(fp->face_verts != NULL); + fp->face_verts = (int16_t *) mem_malloc(nverts * sizeof(*fp->face_verts)); ASSERT(fp->face_verts != NULL); fp->face_uvls = (roomUVL *) mem_malloc(nverts * sizeof(*fp->face_uvls)); ASSERT(fp->face_uvls != NULL); } @@ -3123,7 +3123,7 @@ recheck_face:; else { for (v=0;vnum_verts;v++) { if (fp->face_verts[v] == fp->face_verts[(v+2)%fp->num_verts]) { - short tverts[MAX_VERTS_PER_FACE]; + int16_t tverts[MAX_VERTS_PER_FACE]; roomUVL tuvls[MAX_VERTS_PER_FACE]; for (int i=0;inum_verts-2;i++) { diff --git a/legacy/editor/Erooms.h b/legacy/editor/Erooms.h index cc6e2288..261a1faf 100644 --- a/legacy/editor/Erooms.h +++ b/legacy/editor/Erooms.h @@ -231,7 +231,7 @@ int GetNextRoom (int n); // If the face is convex, returns -1 //NOTE: A face could have multiple concavities, and this will only find the one with the //lowest-numbered vertex -int CheckFaceConcavity(int num_verts,short *face_verts,vector *normal,vector *verts); +int CheckFaceConcavity(int num_verts,int16_t *face_verts,vector *normal,vector *verts); // Goes through each face of the passed room and sets the default uvs void AssignDefaultUVsToRoom (room *rp); @@ -414,7 +414,7 @@ void RemoveAllDuplicateAndUnusedPoints(); //Checks to see if a face is planar. //See if all the points are within a certain distance of an average point //Returns 1 if face is planar, 0 if not -bool FaceIsPlanar(int nv,short *face_verts,vector *normal,vector *verts); +bool FaceIsPlanar(int nv,int16_t *face_verts,vector *normal,vector *verts); //Checks to see if a face is planar. //See if all the points are within a certain distance of an average point diff --git a/legacy/editor/GrFontDialog.cpp b/legacy/editor/GrFontDialog.cpp index b9976f80..1ac7e662 100644 --- a/legacy/editor/GrFontDialog.cpp +++ b/legacy/editor/GrFontDialog.cpp @@ -109,7 +109,7 @@ inline int WRITE_FONT_INT(FONTFILE ffile, int i) { return fwrite(&i, sizeof(i), 1, (FILE *)ffile); } -inline int WRITE_FONT_SHORT(FONTFILE ffile, short s) { +inline int WRITE_FONT_SHORT(FONTFILE ffile, int16_t s) { return fwrite(&s, sizeof(s), 1, (FILE *)ffile); } @@ -620,7 +620,7 @@ int CGrFontDialog::read_font_char(int cur_char, int& bmx, int& bmy) BOOL CGrFontDialog::save_font_file(gr_font_file_record *ft) { uint8_t *tmp_data; - short *tmp_widths; + int16_t *tmp_widths; uint8_t **tmp_cdata; FONTFILE ffile; uint32_t id = 0xfeedbaba; diff --git a/legacy/editor/GrFontDialog.h b/legacy/editor/GrFontDialog.h index 0e057ae5..124f7ffb 100644 --- a/legacy/editor/GrFontDialog.h +++ b/legacy/editor/GrFontDialog.h @@ -111,8 +111,8 @@ private: int m_FontPicBm; // Font picture bitmap handle int m_FontBmW, m_FontBmH; int m_CharHeight; // current character height. - short m_CharWidths[MAX_FONT_CHARS]; - short m_CharMaxWidth; + int16_t m_CharWidths[MAX_FONT_CHARS]; + int16_t m_CharMaxWidth; uint16_t *m_FontBmData; uint16_t *m_DataBuffer, *m_DataPtr; uint16_t m_BgColor, m_BoxColor; diff --git a/legacy/editor/HRoom.cpp b/legacy/editor/HRoom.cpp index 04f38d21..6be40055 100644 --- a/legacy/editor/HRoom.cpp +++ b/legacy/editor/HRoom.cpp @@ -834,10 +834,10 @@ void AddEdgeInsert(int v0,int v1,int new_v) // outbuf - the new polygon created by the part of the input polygon that was clipped away // onv - the number of verys in outbuf // num_vertices - pointer to the number of verts in the vertices array -void ClipAgainstEdge(int nv,short *vertnums,vertex *vertices,int *num_vertices,vector *v0,vector *v1,vector *normal,short *inbuf,int *inv,short *outbuf,int *onv) +void ClipAgainstEdge(int nv,int16_t *vertnums,vertex *vertices,int *num_vertices,vector *v0,vector *v1,vector *normal,int16_t *inbuf,int *inv,int16_t *outbuf,int *onv) { int i,prev,next,check; - short *ip = inbuf,*op = outbuf; + int16_t *ip = inbuf,*op = outbuf; vertex *curv,*prevv,*nextv; int inside_points=0,outside_points=0; //real inside/outside points, distinct from edge points @@ -940,14 +940,14 @@ bool ClipFace(room *arp,int afacenum,room *brp,int bfacenum) face *afp = &arp->faces[afacenum]; face *bfp = &brp->faces[bfacenum]; int edgenum; - short vbuf0[MAX_VERTS_PER_FACE],vbuf1[MAX_VERTS_PER_FACE]; - short newface_verts[MAX_VERTS_PER_FACE][MAX_VERTS_PER_FACE]; + int16_t vbuf0[MAX_VERTS_PER_FACE],vbuf1[MAX_VERTS_PER_FACE]; + int16_t newface_verts[MAX_VERTS_PER_FACE][MAX_VERTS_PER_FACE]; int newface_nvs[MAX_VERTS_PER_FACE]; vertex newverts[MAX_VERTS_PER_FACE]; int newvertnums[MAX_VERTS_PER_FACE]; int num_newverts; int num_newfaces = 0; - short *src,*dest; + int16_t *src,*dest; int nv; int i; @@ -970,7 +970,7 @@ bool ClipFace(room *arp,int afacenum,room *brp,int bfacenum) //Clip our polygon against each edge for (edgenum=0;edgenumnum_verts;edgenum++) { vector *v0,*v1; - short *outbuf = newface_verts[num_newfaces]; + int16_t *outbuf = newface_verts[num_newfaces]; int *onv = &newface_nvs[num_newfaces]; v0 = &brp->verts[bfp->face_verts[(bfp->num_verts-edgenum)%bfp->num_verts]]; @@ -1568,7 +1568,7 @@ void JoinRoomsExact(room *attroomp,int attface,room *baseroomp,int baseface) World_changed = 1; } -bool FaceIsPlanar(int nv,short *face_verts,vector *normal,vector *verts); +bool FaceIsPlanar(int nv,int16_t *face_verts,vector *normal,vector *verts); //Combine two faces, if they can be combined //Parameters: rp - the room the faces are in @@ -1580,7 +1580,7 @@ bool CombineFaces(room *rp,int face0,int face1) face *fp0 = &rp->faces[face0], *fp1 = &rp->faces[face1]; int nv0 = fp0->num_verts, nv1 = fp1->num_verts; int v0,v1; - short vertlist[MAX_VERTS_PER_FACE]; + int16_t vertlist[MAX_VERTS_PER_FACE]; roomUVL uvllist[MAX_VERTS_PER_FACE]; int i,nv; int first0,first1,n0,n1; @@ -2693,7 +2693,7 @@ void BuildSmoothBridge(room *rp0,int facenum0,room *rp1,int facenum1) World_changed = 1; } -short New_face_verts[MAX_VERTS_PER_FACE]; +int16_t New_face_verts[MAX_VERTS_PER_FACE]; int New_face_num_verts=-1; room *New_face_roomp; diff --git a/legacy/editor/ObjectClipboard.cpp b/legacy/editor/ObjectClipboard.cpp index fa92d865..ad60cf4f 100644 --- a/legacy/editor/ObjectClipboard.cpp +++ b/legacy/editor/ObjectClipboard.cpp @@ -144,7 +144,7 @@ bool ObjectPaste() if(!ObjectInBuffer) return false; - short next,prev; + int16_t next,prev; int roomnum; vector pos; matrix orient; diff --git a/legacy/editor/ObjectPropertiesDialog.h b/legacy/editor/ObjectPropertiesDialog.h index 4881f8d5..b966916e 100644 --- a/legacy/editor/ObjectPropertiesDialog.h +++ b/legacy/editor/ObjectPropertiesDialog.h @@ -70,7 +70,7 @@ public: float m_fThrustZ; BOOL m_bTurnroll; float m_fTurnrollRatio; - short m_sTurnrollAngle; + int16_t m_sTurnrollAngle; BOOL m_bUsesThrust; float m_fVelocityX; float m_fVelocityY; diff --git a/legacy/editor/PropertyPhysicsDlg.h b/legacy/editor/PropertyPhysicsDlg.h index c49a1266..648df773 100644 --- a/legacy/editor/PropertyPhysicsDlg.h +++ b/legacy/editor/PropertyPhysicsDlg.h @@ -68,7 +68,7 @@ public: float m_fThrustZ; BOOL m_bTurnroll; float m_fTurnrollRatio; - short m_sTurnrollAngle; + int16_t m_sTurnrollAngle; BOOL m_bUsesThrust; float m_fVelocityX; float m_fVelocityY; diff --git a/legacy/editor/Read3ds.cpp b/legacy/editor/Read3ds.cpp index 3519bdbe..49a6e558 100644 --- a/legacy/editor/Read3ds.cpp +++ b/legacy/editor/Read3ds.cpp @@ -152,12 +152,12 @@ material Materials[MAX_MATERIALS]; typedef struct reading_face { uint8_t flags; // flags for this face (see above) - short portal_num; // which portal this face is part of, or -1 if none + int16_t portal_num; // which portal this face is part of, or -1 if none uint8_t num_verts; // how many vertices in this face - short face_verts[MAX_VERTS_PER_FACE]; // index into list of vertices for this face + int16_t face_verts[MAX_VERTS_PER_FACE]; // index into list of vertices for this face roomUVL face_uvls[MAX_VERTS_PER_FACE]; // index into list of uvls for this face vector normal; // the surface normal of this face - short tmap; // texture numbers for this face + int16_t tmap; // texture numbers for this face } reading_face; typedef struct reading_room { @@ -501,7 +501,7 @@ void Parse3DSMaxChunk (CFILE *fp, int size) case ID_MAT_APP: { char material_name[PAGENAME_LEN]; - short n_faces,face; + int16_t n_faces,face; int done=0; int texnum; @@ -639,7 +639,7 @@ void Parse3DSMaxChunk (CFILE *fp, int size) } //get whatever is left in this segment - this_size = num_faces * ((4 * sizeof(short)) + (6*sizeof(float))); + this_size = num_faces * ((4 * sizeof(int16_t)) + (6*sizeof(float))); if (len-6-this_size ) Parse3DSMaxChunk(fp,len-6-2-this_size); @@ -650,7 +650,7 @@ void Parse3DSMaxChunk (CFILE *fp, int size) case ID_MATRIX: { float room_matrix[12]; - short i; + int16_t i; for (i=0; i<12; i++ ) room_matrix[i] = cf_ReadFloat(fp); break; diff --git a/legacy/editor/ScriptCompilerAPI.cpp b/legacy/editor/ScriptCompilerAPI.cpp index e2f3f63b..809061f4 100644 --- a/legacy/editor/ScriptCompilerAPI.cpp +++ b/legacy/editor/ScriptCompilerAPI.cpp @@ -372,7 +372,7 @@ bool ScriptCreateEmptyLevelScript(char *filename) O(("int STDCALL GetGOScriptID(const char *name,uint8_t is_door);")); O(("void STDCALLPTR CreateInstance(int id);")); O(("void STDCALL DestroyInstance(int id,void *ptr);")); - O(("short STDCALL CallInstanceEvent(int id,void *ptr,int event,tOSIRISEventInfo *data);")); + O(("int16_t STDCALL CallInstanceEvent(int id,void *ptr,int event,tOSIRISEventInfo *data);")); O(("int STDCALL GetTriggerScriptID(int trigger_room, int trigger_face );")); O(("int STDCALL GetCOScriptList( int **list, int **id_list );")); O(("int STDCALL SaveRestoreState( void *file_ptr, uint8_t saving_state );")); @@ -485,7 +485,7 @@ bool ScriptCreateEmptyLevelScript(char *filename) O(("// after this script, than the CONTINUE_DEFAULT setting will be overridden by lower priority")); O(("// scripts return value.")); O(("// The only reserved ID is 0, which must be used for the level script")); - O(("short STDCALL CallInstanceEvent(int id,void *ptr,int event,tOSIRISEventInfo *data)")); + O(("int16_t STDCALL CallInstanceEvent(int id,void *ptr,int event,tOSIRISEventInfo *data)")); O(("{")); O((" return CONTINUE_CHAIN|CONTINUE_DEFAULT;")); O(("}")); @@ -571,7 +571,7 @@ bool ScriptCreateEmptyGameScript(char *filename) O(("int STDCALL GetGOScriptID(const char *name,uint8_t isdoor);")); O(("void STDCALLPTR CreateInstance(int id);")); O(("void STDCALL DestroyInstance(int id,void *ptr);")); - O(("short STDCALL CallInstanceEvent(int id,void *ptr,int event,tOSIRISEventInfo *data);")); + O(("int16_t STDCALL CallInstanceEvent(int id,void *ptr,int event,tOSIRISEventInfo *data);")); O(("int STDCALL SaveRestoreState( void *file_ptr, uint8_t saving_state );")); O(("#ifdef __cplusplus")); O(("}")); @@ -678,7 +678,7 @@ bool ScriptCreateEmptyGameScript(char *filename) O(("// the game for that event. This only pertains to certain events. If the chain continues")); O(("// after this script, than the CONTINUE_DEFAULT setting will be overridden by lower priority")); O(("// scripts return value.")); - O(("short STDCALL CallInstanceEvent(int id,void *ptr,int event,tOSIRISEventInfo *data)")); + O(("int16_t STDCALL CallInstanceEvent(int id,void *ptr,int event,tOSIRISEventInfo *data)")); O(("{")); O((" return CONTINUE_CHAIN|CONTINUE_DEFAULT;")); O(("}")); diff --git a/legacy/editor/WaterProceduralDialog.h b/legacy/editor/WaterProceduralDialog.h index 9653bfd3..c2ebcefc 100644 --- a/legacy/editor/WaterProceduralDialog.h +++ b/legacy/editor/WaterProceduralDialog.h @@ -89,7 +89,7 @@ private: int m_button_down; int m_proc_type; int m_save_x,m_save_y; - short m_height; + int16_t m_height; uint8_t m_frequency; uint8_t m_size; }; diff --git a/legacy/editor/drawworld.cpp b/legacy/editor/drawworld.cpp index 2e931334..b35ddbc3 100644 --- a/legacy/editor/drawworld.cpp +++ b/legacy/editor/drawworld.cpp @@ -310,7 +310,7 @@ void DrawTerrainPoints (vector *view_pos,matrix *view_orient) typedef struct seg_edge { union { - struct {short v0,v1;}; + struct {int16_t v0,v1;}; int32_t vv; }; uint16_t type; @@ -320,7 +320,7 @@ typedef struct seg_edge { seg_edge edge_list[MAX_EDGES]; -short used_list[MAX_EDGES]; //which entries in edge_list have been used +int16_t used_list[MAX_EDGES]; //which entries in edge_list have been used int n_used; int edge_list_size; //set each frame @@ -333,7 +333,7 @@ int edge_list_size; //set each frame int FindEdge(int v0,int v1,seg_edge **edge_ptr) { int32_t vv; - short hash,oldhash; + int16_t hash,oldhash; int ret; vv = (v1<<16) + v0; diff --git a/legacy/editor/ebnode.cpp b/legacy/editor/ebnode.cpp index 593f5457..a6a81ad4 100644 --- a/legacy/editor/ebnode.cpp +++ b/legacy/editor/ebnode.cpp @@ -1031,7 +1031,7 @@ void EBNode_AddEdge(int spnt, int sroom, int epnt, int eroom, bool f_add_reverse if(cost < 1.0f) cost = 1.0f; - snlist->nodes[spnt].edges[new_edge].cost = (cost < 32767.0f)?(short)cost:(short)32767; + snlist->nodes[spnt].edges[new_edge].cost = (cost < 32767.0f)?(int16_t)cost:(int16_t)32767; snlist->nodes[spnt].edges[new_edge].end_index = epnt; snlist->nodes[spnt].edges[new_edge].end_room = BOA_INDEX(eroom); snlist->nodes[spnt].edges[new_edge].flags = 0; @@ -1477,7 +1477,7 @@ void EBNode_ComputeEdgeCosts(int sroom, int spnt, int eroom, int epnt) if(cost < 1.0f) cost = 1.0f; - short scost = (cost < 32767.0f)?(short)cost:(short)32767; + int16_t scost = (cost < 32767.0f)?(int16_t)cost:(int16_t)32767; snlist->nodes[spnt].edges[i].cost = scost; enlist->nodes[epnt].edges[j].cost = scost; diff --git a/legacy/inetfile/inetgetfile.cpp b/legacy/inetfile/inetgetfile.cpp index 16cd369c..bae95ba5 100644 --- a/legacy/inetfile/inetgetfile.cpp +++ b/legacy/inetfile/inetgetfile.cpp @@ -88,7 +88,7 @@ #include "Chttpget.h" extern char *Proxy_server; -extern short Proxy_port; +extern int16_t Proxy_port; #ifdef __LINUX__ @@ -138,7 +138,7 @@ void InetGetFile::AbortGet() } } -InetGetFile::InetGetFile(char *URL,char *localfile,char *proxyip,short proxyport) +InetGetFile::InetGetFile(char *URL,char *localfile,char *proxyip,int16_t proxyport) { m_HardError = 0; http=NULL; diff --git a/legacy/mtclient/chat_api.cpp b/legacy/mtclient/chat_api.cpp index 8f5893e4..a248d43c 100644 --- a/legacy/mtclient/chat_api.cpp +++ b/legacy/mtclient/chat_api.cpp @@ -131,7 +131,7 @@ void ChatInit(void) // exists (Scourge1 for instance) int ConnectToChatServer(char *serveraddr,char *nickname,char *trackerid) { - short chat_port; + int16_t chat_port; char chat_server[50]; char *p; unsigned long argp = 1; diff --git a/legacy/mtclient/chat_api.h b/legacy/mtclient/chat_api.h index 3bd008c4..f70516ed 100644 --- a/legacy/mtclient/chat_api.h +++ b/legacy/mtclient/chat_api.h @@ -47,7 +47,7 @@ typedef struct _Chat_channel typedef struct _Chat_command { - short command; + int16_t command; char data[100]; _Chat_command *next; }Chat_command; diff --git a/legacy/mtclient/mtclient.h b/legacy/mtclient/mtclient.h index d0c70d37..4f7de0f3 100644 --- a/legacy/mtclient/mtclient.h +++ b/legacy/mtclient/mtclient.h @@ -112,9 +112,9 @@ typedef struct s_pxo_game_list char mission_name[MAX_MISSION_NAME_LEN]; char mission_file[MAX_MISSION_FILE_LEN]; char script[MAX_SCRIPT_LEN]; - short level; - short curr_players; - short max_players; + int16_t level; + int16_t curr_players; + int16_t max_players; float ping; uint32_t flags; char format_string[MAX_FORMAT_STRING]; diff --git a/legacy/powerball/powerball.h b/legacy/powerball/powerball.h index 73840bb8..d8e72ea1 100644 --- a/legacy/powerball/powerball.h +++ b/legacy/powerball/powerball.h @@ -110,7 +110,7 @@ extern "C" DLLEXPORT int DLLFUNCCALL GetGOScriptID(char *name,uint8_t isdoor); DLLEXPORT void DLLFUNCCALLPTR CreateInstance(int id); DLLEXPORT void DLLFUNCCALL DestroyInstance(int id,void *ptr); - DLLEXPORT short DLLFUNCCALL CallInstanceEvent(int id,void *ptr,int event,tOSIRISEventInfo *data); + DLLEXPORT int16_t DLLFUNCCALL CallInstanceEvent(int id,void *ptr,int event,tOSIRISEventInfo *data); DLLEXPORT int DLLFUNCCALL SaveRestoreState( void *file_ptr, uint8_t saving_state ); } @@ -172,7 +172,7 @@ void DLLFUNCCALL DestroyInstance(int id,void *ptr) // the game for that event. This only pertains to certain events. If the chain continues // after this script, than the CONTINUE_DEFAULT setting will be overridden by lower priority // scripts return value. -short DLLFUNCCALL CallInstanceEvent(int id,void *ptr,int event,tOSIRISEventInfo *data) +int16_t DLLFUNCCALL CallInstanceEvent(int id,void *ptr,int event,tOSIRISEventInfo *data) { return CONTINUE_CHAIN|CONTINUE_DEFAULT; } diff --git a/legacy/renderer/Direct3D.cpp b/legacy/renderer/Direct3D.cpp index 76401095..7fc02057 100644 --- a/legacy/renderer/Direct3D.cpp +++ b/legacy/renderer/Direct3D.cpp @@ -3021,7 +3021,7 @@ void d3d_GetRenderState(rendering_state *rstate) { memcpy(rstate, &D3D_state, si // Sets the coplanar z bias for rendered polygons void d3d_SetCoplanarPolygonOffset(float factor) { - short depth_level; + int16_t depth_level; if (d3d_ZBias && !d3d_WBuffer) { depth_level = (factor * 2); @@ -3297,7 +3297,7 @@ void d3d_Screenshot(int bm_handle) { g = std::min(255, (float)g * 1.4f); b = std::min(255, (float)b * 1.4f); - short short_pix = GR_RGB16(r, g, b); + int16_t short_pix = GR_RGB16(r, g, b); dest_data[i * w + t] = OPAQUE_FLAG | short_pix; } diff --git a/lib/3d.h b/lib/3d.h index 34574ca6..7c4b7803 100644 --- a/lib/3d.h +++ b/lib/3d.h @@ -235,7 +235,7 @@ typedef struct g3Point { float p3_sx, p3_sy; // screen x&y uint8_t p3_codes; // clipping codes uint8_t p3_flags; // projected? - short p3_pad; // keep structure longword aligned + int16_t p3_pad; // keep structure longword aligned vector p3_vec; // x,y,z of rotated point vector p3_vecPreRot; // original XYZ of the point g3UVL p3_uvl; // uv & lighting values @@ -302,7 +302,7 @@ void g3_GetFOV(float *fov_x, float *fov_y); // get zoom. For a given window size, return the zoom which will achieve // the given FOV along the given axis. -float g3_GetZoom(char axis, float fov, short window_width, short window_height); +float g3_GetZoom(char axis, float fov, int16_t window_width, int16_t window_height); // returns the normalized, unscaled view vectors void g3_GetViewVectors(vector *forward, vector *up, vector *right); @@ -326,7 +326,7 @@ void g3_ProjectPoint(g3Point *point); float g3_CalcPointDepth(vector *pnt); // from a 2d point, compute the vector through that point -void g3_Point2Vec(vector *v, short sx, short sy); +void g3_Point2Vec(vector *v, int16_t sx, int16_t sy); // code a point. fills in the p3_codes field of the point, and returns the codes uint8_t g3_CodePoint(g3Point *point); diff --git a/lib/Controller.h b/lib/Controller.h index 28ad567a..e3f85f0b 100644 --- a/lib/Controller.h +++ b/lib/Controller.h @@ -187,7 +187,7 @@ const uint8_t CT_X_AXIS = 1, // AXIS constants for ctAxis #define CONTROLLER_CTL_INFO(_l, _h) makeshort(_h, _l) #define CONTROLLER_VALUE(_l) ((uint16_t)loword(_l)) -#define CONTROLLER_INFO(_l) ((short)hiword(_l)) +#define CONTROLLER_INFO(_l) ((int16_t)hiword(_l)) #define MAKE_CONFIG_DATA(_c, _v) makeword(_c, _v) #define CTLBINDS_PER_FUNC 2 diff --git a/lib/PHYSICS.H b/lib/PHYSICS.H index e1031205..0aa6a838 100644 --- a/lib/PHYSICS.H +++ b/lib/PHYSICS.H @@ -105,7 +105,7 @@ void do_walking_sim(object *obj); // Applies an instantaneous force on an object, resulting in an instantaneous // change in velocity. -void phys_apply_force(object *obj, vector *force_vec, short weapon_index = -1); +void phys_apply_force(object *obj, vector *force_vec, int16_t weapon_index = -1); void phys_apply_rot(object *obj, vector *force_vec); // this routine will set the thrust for an object to a value that will diff --git a/lib/bitmap.h b/lib/bitmap.h index b493818a..1e8dc823 100644 --- a/lib/bitmap.h +++ b/lib/bitmap.h @@ -60,7 +60,7 @@ typedef struct { uint16_t width, height; // Width and height in pixels uint16_t used; // Is this bitmap free to be allocated? - short cache_slot; // For use by the rendering lib + int16_t cache_slot; // For use by the rendering lib uint8_t mip_levels; uint8_t flags; diff --git a/lib/bumpmap.h b/lib/bumpmap.h index 89d1ab46..fc34f170 100644 --- a/lib/bumpmap.h +++ b/lib/bumpmap.h @@ -29,7 +29,7 @@ typedef struct { uint16_t *data; // 8bit data - short cache_slot; // for the renderers use + int16_t cache_slot; // for the renderers use uint8_t width, height; uint8_t flags, pad; } bms_bumpmap; diff --git a/lib/collide.h b/lib/collide.h index e69260a7..01629d48 100644 --- a/lib/collide.h +++ b/lib/collide.h @@ -116,7 +116,7 @@ extern void collide_player_and_nasty_robot(object *player, object *robot, vector extern void net_destroy_controlcen(object *controlcen); extern void collide_player_and_powerup(object *player, object *powerup, vector *collision_point); // extern int check_effect_blowup(segment *seg,int side,vector *pnt, object *blower, int force_blowup_flag); -extern void apply_damage_to_controlcen(object *controlcen, float damage, short who); +extern void apply_damage_to_controlcen(object *controlcen, float damage, int16_t who); extern void bump_one_object(object *obj0, vector *hit_dir, float damage); extern void FindHitpointUV(float *u, float *v, vector *point, room *rp, int facenum); diff --git a/lib/d3music.h b/lib/d3music.h index f9c44e09..53fb0980 100644 --- a/lib/d3music.h +++ b/lib/d3music.h @@ -105,7 +105,7 @@ typedef struct tMusicSeqInfo { float frametime; // frame time. // OUTPUT - short cur_song; // current song. + int16_t cur_song; // current song. float peace_timer; // current peace timer const char *cur_loop_name; // current loop playing (NULL if none.) @@ -150,14 +150,14 @@ void D3MusicResume(); bool IsD3MusicOn(); // set music region -void D3MusicSetRegion(short region, bool immediate = false); +void D3MusicSetRegion(int16_t region, bool immediate = false); // retreives current region (can be different than regin passed to D3MusicSetRegion), // returns current played region, not waiting region. -short D3MusicGetRegion(); +int16_t D3MusicGetRegion(); // retreives current pending region -short D3MusicGetPendingRegion(); +int16_t D3MusicGetPendingRegion(); // starts special in-game cinematic music void D3MusicStartCinematic(); diff --git a/lib/ddio_common.h b/lib/ddio_common.h index 1764014b..5d753ad1 100644 --- a/lib/ddio_common.h +++ b/lib/ddio_common.h @@ -200,7 +200,7 @@ void ddio_SetKeyboardLanguage(int language); // ---------------------------------------------------------------------------- // array of key states. -extern volatile short DDIO_key_down_count[]; +extern volatile int16_t DDIO_key_down_count[]; extern volatile uint8_t DDIO_key_state[]; #define KEY_STATE(_c) DDIO_key_state[_c] diff --git a/lib/dedicated_server.h b/lib/dedicated_server.h index f76d021c..d537caff 100644 --- a/lib/dedicated_server.h +++ b/lib/dedicated_server.h @@ -34,7 +34,7 @@ typedef struct { cvar_type type; void *dest_variable; int var_min, var_max; - short permissions; + int16_t permissions; } cvar_entry; extern bool Dedicated_server; diff --git a/lib/demofile.h b/lib/demofile.h index ae0009b8..3991735b 100644 --- a/lib/demofile.h +++ b/lib/demofile.h @@ -106,6 +106,8 @@ #ifndef _DEMO_FILE_HEADER_ #define _DEMO_FILE_HEADER_ +#include + extern char Demo_fname[_MAX_PATH * 2]; extern uint32_t Demo_flags; @@ -165,7 +167,7 @@ void DemoWriteHudMessage(uint32_t color, bool blink, char *msg); void DemoWriteChangedObjects(); void DemoWriteWeaponFire(uint16_t objectnum, vector *pos, vector *dir, uint16_t weaponnum, - uint16_t weapobjnum, short gunnum); + uint16_t weapobjnum, int16_t gunnum); void DemoWriteObjCreate(uint8_t type, uint16_t id, int roomnum, vector *pos, const matrix *orient, int parent_handle, object *obj); @@ -186,7 +188,7 @@ void DemoWriteKillObject(object *hit_obj, object *killer, float damage, int deat void DemoWritePlayerDeath(object *player, bool melee, int fate = -1); -void DemoWrite3DSound(short soundidx, uint16_t objnum, int priority, float volume = 0.5f); +void DemoWrite3DSound(int16_t soundidx, uint16_t objnum, int priority, float volume = 0.5f); void DemoWriteCollidePlayerWeapon(object *playerobj, object *weapon, vector *collision_point, vector *collision_normal, bool f_reverse_normal, void *hit_info); @@ -218,7 +220,7 @@ void DemoPostPlaybackMenu(void); void DemoReadObjWeapFireFlagChanged(void); -void DemoWriteObjWeapFireFlagChanged(short objnum); +void DemoWriteObjWeapFireFlagChanged(int16_t objnum); void DemoWritePlayerInfo(void); @@ -254,7 +256,7 @@ void DemoReadPlayerTypeChange(void); void DemoWriteObjLifeLeft(object *obj); void DemoReadObjLifeLeft(void); -void DemoWrite2DSound(short soundidx, float volume = 0.5f); +void DemoWrite2DSound(int16_t soundidx, float volume = 0.5f); void DemoRead2DSound(void); #endif diff --git a/lib/findintersection.h b/lib/findintersection.h index e48bec29..b9873695 100644 --- a/lib/findintersection.h +++ b/lib/findintersection.h @@ -100,7 +100,7 @@ * * 28 3/23/98 11:18a Chris * Added int fvi_QuickDistObjectList(vector *pos, int init_room_index, - * float rad, short *object_index_list, int max_elements) + * float rad, int16_t *object_index_list, int max_elements) * * * 27 3/17/98 11:33a Chris @@ -345,7 +345,7 @@ typedef struct fvi_query { vector *p0, *p1; int startroom; float rad; - short thisobjnum; + int16_t thisobjnum; int *ignore_obj_list; int flags; @@ -391,7 +391,7 @@ extern int fvi_QuickDistFaceList(int init_room_index, vector *pos, float rad, fv extern int fvi_QuickDistCellList(int init_cell_index, vector *pos, float rad, int *quick_cell_list, int max_elements); // Returns the number of objects that are approximately within the specified radius -int fvi_QuickDistObjectList(vector *pos, int init_roomnum, float rad, short *object_index_list, int max_elements, +int fvi_QuickDistObjectList(vector *pos, int init_roomnum, float rad, int16_t *object_index_list, int max_elements, bool f_lightmap_only, bool f_only_players_and_ais = false, bool f_include_non_collide_objects = false, bool f_stop_at_closed_doors = false); diff --git a/lib/forcefeedback.h b/lib/forcefeedback.h index f640389d..62f37cae 100644 --- a/lib/forcefeedback.h +++ b/lib/forcefeedback.h @@ -363,13 +363,13 @@ void ddio_ffb_DestroyAll(void); // Purpose: // Play an effect that was previously created. // ------------------------------------------------------------------- -void ddio_ffb_effectPlay(short eID); +void ddio_ffb_effectPlay(int16_t eID); // ------------------------------------------------------------------- // ddio_ffb_effectStop // Purpose: // Stop a single effect. // ------------------------------------------------------------------- -void ddio_ffb_effectStop(short eID); +void ddio_ffb_effectStop(int16_t eID); // ------------------------------------------------------------------- // ddio_ffb_effectStopAll // Purpose: @@ -382,21 +382,21 @@ void ddio_ffb_effectStopAll(tDevice dev); // Unload a single effect... Necessary to make room for other // effects. // ------------------------------------------------------------------- -void ddio_ffb_effectUnload(short eID); +void ddio_ffb_effectUnload(int16_t eID); // ------------------------------------------------------------------- // ddio_ffb_effectModify // Purpose: // Modifies a single effect, only if the given parameters are // different from what's currently loaded. // ------------------------------------------------------------------- -void ddio_ffb_effectModify(short eID, int *Direction, uint32_t *Duration, uint32_t *Gain, uint32_t *Period, +void ddio_ffb_effectModify(int16_t eID, int *Direction, uint32_t *Duration, uint32_t *Gain, uint32_t *Period, tEffInfo *TypeInfo, tEffEnvelope *Envelope); // ------------------------------------------------------------------- // ddio_ffb_GetEffectData // Purpose: // Retrieves affect data for the given parameters, pass NULL for those you don't want // ------------------------------------------------------------------- -void ddio_ffb_GetEffectData(short eID, int *Direction, uint32_t *Duration, uint32_t *Gain, uint32_t *Period, +void ddio_ffb_GetEffectData(int16_t eID, int *Direction, uint32_t *Duration, uint32_t *Gain, uint32_t *Period, tEffInfo *TypeInfo, tEffEnvelope *Envelope); // ------------------------------------------------------------------- // ddio_ffjoy_EnableAutoCenter diff --git a/lib/gr.h b/lib/gr.h index f140ebfe..6f8eee02 100644 --- a/lib/gr.h +++ b/lib/gr.h @@ -151,15 +151,15 @@ const int MAX_FONTS = 16, MAX_FONT_BITMAPS = 12; #define DEFAULT_FONT 0 typedef struct gr_font_file_record { - short width, height; // width of widest character and height of longest char - short flags; // flags used by the character renderer - short baseline; // pixels given to lowercase below script line start at baseline + int16_t width, height; // width of widest character and height of longest char + int16_t flags; // flags used by the character renderer + int16_t baseline; // pixels given to lowercase below script line start at baseline uint8_t min_ascii; // minimum ascii value used by font uint8_t max_ascii; // max ascii value used by the font - short byte_width; // width of a character in the font in bytes + int16_t byte_width; // width of a character in the font in bytes uint8_t *raw_data; // pixel, map data. uint8_t **char_data; // pointers to each character - short *char_widths; // individual pixel widths of each character + int16_t *char_widths; // individual pixel widths of each character uint8_t *kern_data; // kerning information for specific letter combos } gr_font_file_record; diff --git a/lib/grtext.h b/lib/grtext.h index 89cb3a0f..f14fe068 100644 --- a/lib/grtext.h +++ b/lib/grtext.h @@ -290,18 +290,18 @@ void grfont_Spew(int font, int x, int y); typedef struct tFontFileInfo2 // to maintain compatibility with older fonts (64 bytes long) { - short tracking; + int16_t tracking; char reserved[62]; } tFontFileInfo2; // font data structure internal to library but available for font editors typedef struct tFontFileInfo { - short width, height; // width of widest character and height of longest char - short flags; // flags used by the character renderer - short baseline; // pixels given to lowercase below script line start at baseline + int16_t width, height; // width of widest character and height of longest char + int16_t flags; // flags used by the character renderer + int16_t baseline; // pixels given to lowercase below script line start at baseline uint8_t min_ascii; // minimum ascii value used by font uint8_t max_ascii; // max ascii value used by the font - short byte_width; // width of a character in the font in bytes + int16_t byte_width; // width of a character in the font in bytes uint8_t *raw_data; // pixel, map data. uint8_t **char_data; // pointers to each character uint8_t *char_widths; // individual pixel widths of each character diff --git a/lib/lightmap.h b/lib/lightmap.h index 472c0172..4602f0ed 100644 --- a/lib/lightmap.h +++ b/lib/lightmap.h @@ -36,7 +36,7 @@ typedef struct { uint16_t used; uint8_t flags; - short cache_slot; // for the renderers use + int16_t cache_slot; // for the renderers use uint8_t square_res; // for renderers use uint8_t cx1, cy1, cx2, cy2; // Change x and y coords } bms_lightmap; diff --git a/lib/linux/oelnx_os.h b/lib/linux/oelnx_os.h index 596ba548..a000acae 100644 --- a/lib/linux/oelnx_os.h +++ b/lib/linux/oelnx_os.h @@ -127,7 +127,7 @@ protected: Str255 mPrefsFolderName; OSType mPrefsFileType; FSSpec mPrefsFileSpec; - short mPrefsFileRefNum; + int16_t mPrefsFileRefNum; }; /******************************************* diff --git a/lib/megacell.h b/lib/megacell.h index 844054a8..97aef06c 100644 --- a/lib/megacell.h +++ b/lib/megacell.h @@ -36,7 +36,7 @@ typedef struct { int8_t width; int8_t height; - short texture_handles[MAX_MEGACELL_WIDTH * MAX_MEGACELL_HEIGHT]; + int16_t texture_handles[MAX_MEGACELL_WIDTH * MAX_MEGACELL_HEIGHT]; int flags; uint8_t used; } megacell; diff --git a/lib/movie.h b/lib/movie.h index c55ebd62..53d66612 100644 --- a/lib/movie.h +++ b/lib/movie.h @@ -52,15 +52,15 @@ intptr_t mve_SequenceFrame(intptr_t handle, int fhandle, bool sequence, int *bm_ bool mve_SequenceClose(intptr_t handle, int fhandle); // sets render frame boundaries. -void mve_SetRenderProperties(short x, short y, short w, short h, renderer_type type, bool hicolor); +void mve_SetRenderProperties(int16_t x, int16_t y, int16_t w, int16_t h, renderer_type type, bool hicolor); // called every frame. typedef void (*MovieFrameCallback_fp)(int x, int y, int movieFrameNum); void mve_SetCallback(MovieFrameCallback_fp callBack); // call to print out text. -void mve_Puts(short x, short y, ddgr_color col, const char *txt); +void mve_Puts(int16_t x, int16_t y, ddgr_color col, const char *txt); -void mve_ClearRect(short x1, short y1, short x2, short y2); +void mve_ClearRect(int16_t x1, int16_t y1, int16_t x2, int16_t y2); #endif diff --git a/lib/mvelibw.h b/lib/mvelibw.h index 2e660563..4832a43c 100644 --- a/lib/mvelibw.h +++ b/lib/mvelibw.h @@ -138,7 +138,7 @@ MVE_SetPalette(uint8_t *p, unsigned start, unsigned count); /* Configure the software for a graphics mode, optionally setting the ** display to that mode (see the MVE_GFX_xxx constants defined below). */ -unsigned __cdecl MVE_gfxMode(short mode); +unsigned __cdecl MVE_gfxMode(int16_t mode); /* Reset the screen to text mode (usually done before exiting a program). */ diff --git a/lib/polymodel_external.h b/lib/polymodel_external.h index cd87ed7d..3d751004 100644 --- a/lib/polymodel_external.h +++ b/lib/polymodel_external.h @@ -123,7 +123,7 @@ typedef struct { typedef struct { uint8_t num_models; - short num_faces[MAX_SUBOBJECTS]; + int16_t num_faces[MAX_SUBOBJECTS]; lightmap_object_face *lightmap_faces[MAX_SUBOBJECTS]; uint8_t used; @@ -131,14 +131,14 @@ typedef struct { typedef struct polyface { int8_t nverts; - short *vertnums; + int16_t *vertnums; float *u; float *v; // float *u2,*v2; // For lightmaps only ddgr_color color; - short texnum; + int16_t texnum; vector normal; } polyface; @@ -171,7 +171,7 @@ typedef struct bsp_info { vector *face_min; vector *face_max; - short *vertnum_memory; + int16_t *vertnum_memory; float *u_memory; float *v_memory; @@ -248,7 +248,7 @@ typedef struct poly_model { float rad; int n_textures; - short textures[MAX_MODEL_TEXTURES]; // a list of bitmap indices + int16_t textures[MAX_MODEL_TEXTURES]; // a list of bitmap indices bsp_info *submodel; // an array of size n_models of submodel info. int num_key_angles; diff --git a/lib/psclass.h b/lib/psclass.h index 295f4ce2..10aa0073 100644 --- a/lib/psclass.h +++ b/lib/psclass.h @@ -150,14 +150,14 @@ public: template class tQueue { T m_items[t_LEN]; - short m_head, m_tail; + int16_t m_head, m_tail; public: tQueue() { m_head = m_tail = 0; }; ~tQueue(){}; void send(T &item) { // sends an item onto the queue - short temp = m_tail + 1; + int16_t temp = m_tail + 1; if (temp == t_LEN) temp = 0; if (temp != m_head) { diff --git a/lib/ui.h b/lib/ui.h index 3e313b17..93908cd4 100644 --- a/lib/ui.h +++ b/lib/ui.h @@ -385,7 +385,7 @@ class UIGadget : public UIObject { // information for gadgets private: int m_ID; // id value of gadget. - short m_Datum; // used to pass info around. + int16_t m_Datum; // used to pass info around. uint16_t m_Hotkey; int m_SavedW, m_SavedH; // saved values of width and height. bool m_Disabled; // is gadget disabled? @@ -477,8 +477,8 @@ public: // settings void SetHotkey(int key); // set this when key is pressed, selects gadget. int GetID() const { return m_ID; }; - short GetDatum() const { return m_Datum; }; - void SetDatum(short datum) { m_Datum = datum; }; + int16_t GetDatum() const { return m_Datum; }; + void SetDatum(int16_t datum) { m_Datum = datum; }; bool IsDisabled() { return m_Disabled; }; // returns disabled state. void Disable() { m_Disabled = true; }; // disables gadget. void Enable() { m_Disabled = false; }; // enables gadget. diff --git a/lib/win/win32app.h b/lib/win/win32app.h index 6e326d2c..bf5ffbcc 100644 --- a/lib/win/win32app.h +++ b/lib/win/win32app.h @@ -226,6 +226,6 @@ private: }; // system mouse info. -extern short w32_msewhl_delta; // value of mouse wheel delta for frame +extern int16_t w32_msewhl_delta; // value of mouse wheel delta for frame #endif diff --git a/libmve/mvelibi.h b/libmve/mvelibi.h index 67edd82c..bc80424a 100644 --- a/libmve/mvelibi.h +++ b/libmve/mvelibi.h @@ -54,7 +54,7 @@ // overloading inline uint16_t IntelSwapper(uint16_t a) { return INTEL_SHORT(a); } -inline short IntelSwapper(short a) { return INTEL_SHORT(a); } +inline int16_t IntelSwapper(int16_t a) { return INTEL_SHORT(a); } inline uint32_t IntelSwapper(uint32_t a) { return INTEL_INT(a); } diff --git a/libmve/mvelibl.cpp b/libmve/mvelibl.cpp index ccbd63ab..21bbdd7d 100644 --- a/libmve/mvelibl.cpp +++ b/libmve/mvelibl.cpp @@ -1059,7 +1059,7 @@ void MVE_ForceVresHalf(void) {} // If auto is set, and this function is being called to change mode // for movie, be sure to turn auto back on after call! // -bool MVE_gfxMode(short mode) { return false; } +bool MVE_gfxMode(int16_t mode) { return false; } // Restore a text mode void MVE_gfxReset(void) { @@ -1317,7 +1317,7 @@ int MVE_rmStepMovie(void) { marg_gfxMode *arg = (marg_gfxMode *)p; arg->SwapBytes(); if (sf_auto) { - short mode = arg->mode; + int16_t mode = arg->mode; if (opt_fastmode && (opt_fastmode & 4) == 0) mode |= 0x8000; if (sf_auto_mode != mode) diff --git a/libmve/mvelibl.h b/libmve/mvelibl.h index 9fed9af7..5ff1559e 100644 --- a/libmve/mvelibl.h +++ b/libmve/mvelibl.h @@ -111,7 +111,7 @@ void MVE_SetPalette(uint8_t *p, unsigned start, unsigned count); // Configure the software for a graphics mode, optionally setting the // display to that mode (see the MVE_GFX_xxx constants defined below). -bool MVE_gfxMode(short mode); +bool MVE_gfxMode(int16_t mode); // Reset the screen to text mode (usually done before exiting a program). void MVE_gfxReset(void); diff --git a/libmve/snd8to16.h b/libmve/snd8to16.h index 962bd66e..52e70307 100644 --- a/libmve/snd8to16.h +++ b/libmve/snd8to16.h @@ -31,7 +31,7 @@ ** } */ -#define S short +#define S int16_t int16_t snd_8to16[256] = { (S)0, (S)1, (S)2, (S)3, (S)4, (S)5, (S)6, (S)7, (S)(S)8, (S)9, (S)10, (S)11, diff --git a/linux/lnxcon.cpp b/linux/lnxcon.cpp index 89389cac..f63775b2 100644 --- a/linux/lnxcon.cpp +++ b/linux/lnxcon.cpp @@ -126,7 +126,7 @@ void con_Puts(int window, const char *str); ////////////////////////////////////////////////// // Functions void con_Update(int windows) { - if (!Con_init) // console hasn't been initialized yet, short circuit + if (!Con_init) // console hasn't been initialized yet, int16_t circuit return; if (Console_mode == Console_null || Console_mode == Console_raw) { @@ -153,7 +153,7 @@ void con_Update(int windows) { } void con_Printf(const char *fmt, ...) { - if (!Con_init) // console hasn't been initialized yet, short circuit + if (!Con_init) // console hasn't been initialized yet, int16_t circuit return; char buf[CON_MAX_STRINGLEN]; diff --git a/lnxmvelib/mvelibl.cpp b/lnxmvelib/mvelibl.cpp index 81c36782..9a28afb9 100644 --- a/lnxmvelib/mvelibl.cpp +++ b/lnxmvelib/mvelibl.cpp @@ -1095,7 +1095,7 @@ void MVE_ForceVresHalf(void) {} // If auto is set, and this function is being called to change mode // for movie, be sure to turn auto back on after call! // -unsigned MVE_gfxMode(short mode) { return FALSE; } +unsigned MVE_gfxMode(int16_t mode) { return FALSE; } // Restore a text mode void MVE_gfxReset(void) { @@ -1354,7 +1354,7 @@ int MVE_rmStepMovie(void) { arg->minh = INTEL_SHORT(arg->minh); arg->mode = INTEL_SHORT(arg->mode); if (sf_auto) { - short mode = arg->mode; + int16_t mode = arg->mode; if (opt_fastmode && (opt_fastmode & 4) == 0) mode |= 0x8000; if (sf_auto_mode != mode) diff --git a/lnxmvelib/mvelibl.h b/lnxmvelib/mvelibl.h index 33c39618..f460f564 100644 --- a/lnxmvelib/mvelibl.h +++ b/lnxmvelib/mvelibl.h @@ -127,7 +127,7 @@ void MVE_SetPalette(uint8_t *p, unsigned start, unsigned count); /* Configure the software for a graphics mode, optionally setting the ** display to that mode (see the MVE_GFX_xxx constants defined below). */ -unsigned MVE_gfxMode(short mode); +unsigned MVE_gfxMode(int16_t mode); /* Reset the screen to text mode (usually done before exiting a program). */ diff --git a/md5/md5.cpp b/md5/md5.cpp index 2d1cfbed..f33c05c4 100644 --- a/md5/md5.cpp +++ b/md5/md5.cpp @@ -169,10 +169,10 @@ void MD5::update(int valin) noexcept { update(p, sizeof(int)); } -void MD5::update(short valin) noexcept { - short val = INTEL_SHORT(valin); +void MD5::update(int16_t valin) noexcept { + int16_t val = INTEL_SHORT(valin); uint8_t *p = (uint8_t *)&val; - update(p, sizeof(short)); + update(p, sizeof(int16_t)); } void MD5::update(uint32_t valin) noexcept { diff --git a/md5/md5.h b/md5/md5.h index 383c4c9e..e9241a87 100644 --- a/md5/md5.h +++ b/md5/md5.h @@ -39,7 +39,7 @@ public: void update(int val) noexcept; void update(uint32_t val) noexcept; void update(uint8_t val) noexcept; - void update(short val) noexcept; + void update(int16_t val) noexcept; std::array digest() const noexcept; void digest(uint8_t *destination) const noexcept; }; diff --git a/md5/tests/md5_tests.cpp b/md5/tests/md5_tests.cpp index ade262b5..ab477827 100644 --- a/md5/tests/md5_tests.cpp +++ b/md5/tests/md5_tests.cpp @@ -30,7 +30,7 @@ std::string hexdigest_after_n_rounds_of_fuzz(int n) { for (int i = 0; i < n; ++i) { md5.update((float)1.0f); md5.update((int)2); - md5.update((short)3); + md5.update((int16_t)3); md5.update((uint32_t)4U); md5.update((uint8_t)5); } diff --git a/model/newstyle.cpp b/model/newstyle.cpp index 87b2c81f..89eded77 100644 --- a/model/newstyle.cpp +++ b/model/newstyle.cpp @@ -112,7 +112,7 @@ static float Fog_distance, Fog_eye_distance; static vector Fog_view_pos, Specular_view_pos, Bump_view_pos; static matrix Unscaled_bumpmap_matrix; -static int ModelFaceSortFunc(const short *a, const short *b); +static int ModelFaceSortFunc(const int16_t *a, const int16_t *b); static inline void RenderSubmodelFace(poly_model *pm, bsp_info *sm, int facenum); static inline void RenderSubmodelLightmapFace(poly_model *pm, bsp_info *sm, int facenum); static inline void RenderSubmodelFaceFogged(poly_model *pm, bsp_info *sm, int facenum); @@ -132,7 +132,7 @@ static void RotateModelPoints(poly_model *pm, bsp_info *sm); static float ComputeDefaultSizeFunc(int handle, float *size_ptr, vector *offset_ptr, bool f_use_all_frames); -int ModelFaceSortFunc(const short *a, const short *b) { +int ModelFaceSortFunc(const int16_t *a, const int16_t *b) { float az, bz; az = face_depth[*a]; @@ -749,7 +749,7 @@ void RenderSubmodelFacesSorted(poly_model *pm, bsp_info *sm) { void RenderSubmodelFacesUnsorted(poly_model *pm, bsp_info *sm) { int i; int modelnum = sm - pm->submodel; - short alpha_faces[MAX_FACES_PER_ROOM], num_alpha_faces = 0; + int16_t alpha_faces[MAX_FACES_PER_ROOM], num_alpha_faces = 0; int rcount = 0; vector view_pos; diff --git a/model/polymodel.cpp b/model/polymodel.cpp index 231a3682..e32b7a1d 100644 --- a/model/polymodel.cpp +++ b/model/polymodel.cpp @@ -1533,7 +1533,7 @@ int ReadNewModelFile(int polynum, CFILE *infile) { // Allocate our space if (current_count) { - sm->vertnum_memory = (short *)mem_malloc(current_count * sizeof(short)); + sm->vertnum_memory = (int16_t *)mem_malloc(current_count * sizeof(int16_t)); ASSERT(sm->vertnum_memory); sm->u_memory = (float *)mem_malloc(current_count * sizeof(float)); diff --git a/movie/d3movie.cpp b/movie/d3movie.cpp index 518e1ce8..2a41c8a1 100644 --- a/movie/d3movie.cpp +++ b/movie/d3movie.cpp @@ -465,7 +465,7 @@ void mve_SetCallback(MovieFrameCallback_fp callBack) { } // used to tell movie library how to render movies. -void mve_SetRenderProperties(short x, short y, short w, short h, renderer_type type, bool hicolor) {} +void mve_SetRenderProperties(int16_t x, int16_t y, int16_t w, int16_t h, renderer_type type, bool hicolor) {} #ifdef __LINUX__ // locates the case-sensitive movie file name @@ -842,7 +842,7 @@ bool mve_SequenceClose(intptr_t hMovie, int hFile) { #endif } -void mve_Puts(short x, short y, ddgr_color col, const char *txt) { +void mve_Puts(int16_t x, int16_t y, ddgr_color col, const char *txt) { grtext_SetFont(BRIEFING_FONT); grtext_SetColor(col); grtext_SetAlpha(255); @@ -851,7 +851,7 @@ void mve_Puts(short x, short y, ddgr_color col, const char *txt) { grtext_Flush(); } -void mve_ClearRect(short x1, short y1, short x2, short y2) { +void mve_ClearRect(int16_t x1, int16_t y1, int16_t x2, int16_t y2) { // Note: I can not figure out how to clear, and then write over it with text. It always covers my text! // rend_FillRect( GR_BLACK, x1, y1, x2, y2 ); } diff --git a/music/music.h b/music/music.h index f7fdb96b..cfc30fe0 100644 --- a/music/music.h +++ b/music/music.h @@ -222,15 +222,15 @@ public: class oms_tracklist { char **m_fnamelist; // filename list char **m_symlist; // symbolic list - short m_numtracks; // number of tracks - short m_maxtracks; + int16_t m_numtracks; // number of tracks + int16_t m_maxtracks; bool m_init; // determines if initialized public: oms_tracklist(); ~oms_tracklist(); - void init(short maxtracks); // initializes track list system + void init(int16_t maxtracks); // initializes track list system void free(); // frees track list system void reset(); // resets track list to 0 @@ -244,7 +244,7 @@ public: // this is an intermediate between song playback and event driven music. // the calling application must act as the 'brain' in most cases. -typedef short tMusicVal; // used for paramaters +typedef int16_t tMusicVal; // used for paramaters inline float NORMALIZE_MUSICVAL(tMusicVal val) { return ((float)val) / 255.0f; } inline tMusicVal QUANTIZE_MUSICVAL(float fval) { return (fval * 255); } @@ -279,11 +279,11 @@ class OutrageMusicSeq { oms_stream *old_strm; // previous stream. const char *loop_name; const char *pending_loop_name; // loop name preparing to play. - short region; // region id. - short type; + int16_t region; // region id. + int16_t type; music_ins *ins; // intro, combat, etc. section - short last_ip; // last ip value - short ip; + int16_t last_ip; // last ip value + int16_t ip; tMusicVal b_reg; // branch register tMusicVal c_reg; // compare regs tMusicVal p_reg; // play count register. @@ -311,13 +311,13 @@ class OutrageMusicSeq { oms_tracklist m_tracklist; // sequencer track list. tList m_music_list; // list of tracks. - short m_curregion; // current region. + int16_t m_curregion; // current region. private: // Music list management - music_stream *AddToList(short region, short theme_type, int n_inst, const music_ins *ins); + music_stream *AddToList(int16_t region, int16_t theme_type, int n_inst, const music_ins *ins); void FreeList(); - music_stream *GetSong(short region, short theme_type); + music_stream *GetSong(int16_t region, int16_t theme_type); bool LoadTheme(const char *file); // takes a filename containing oms data. void ExecScript(music_stream *strm); @@ -377,11 +377,11 @@ public: tMusicVal GetRegister(int parm); // region setting - void SetCurrentRegion(short region); - short GetCurrentRegion() const; + void SetCurrentRegion(int16_t region); + int16_t GetCurrentRegion() const; // gets current region PLAYING, not PENDING like above. - short GetPlayingRegion() const; + int16_t GetPlayingRegion() const; // get current loop playing const char *GetCurrentLoopName(int *loop_count); diff --git a/music/omflex.cpp b/music/omflex.cpp index 7f066928..172689b4 100644 --- a/music/omflex.cpp +++ b/music/omflex.cpp @@ -129,11 +129,11 @@ bool OutrageMusicSeq::LoadTheme(const char *file) { int theme_type; music_ins temp_ins_buf[MAX_MUSIC_INSTRUCTIONS]; int temp_ins_idx = 0; - short cur_region; + int16_t cur_region; struct { char *name; - short index; - short region; + int16_t index; + int16_t region; } labels[MAX_FILE_LABELS]; int n_labels = 0, n_relabels = 0; bool in_region = false; @@ -307,7 +307,7 @@ bool OutrageMusicSeq::LoadTheme(const char *file) { case OMFCMD_ENDSECTION: ADD_NEW_INS_NUM(OMFCMD_ENDSECTION, 0); - if (!AddToList((short)cur_region, (short)theme_type, temp_ins_idx, temp_ins_buf)) { + if (!AddToList((int16_t)cur_region, (int16_t)theme_type, temp_ins_idx, temp_ins_buf)) { cmd = OMFFILEERR_ADDSECTION; goto force_error; } diff --git a/music/sequencer.cpp b/music/sequencer.cpp index 04444911..c25255ed 100644 --- a/music/sequencer.cpp +++ b/music/sequencer.cpp @@ -576,7 +576,7 @@ next_ins: // start a song, stopping the old either cleanly (on measure) or abruptly. void OutrageMusicSeq::StartSong(int song, bool clean_switch) { if (m_curregion >= 0) { - m_pending_song = GetSong(m_curregion, (short)song); + m_pending_song = GetSong(m_curregion, (int16_t)song); } else { m_pending_song = NULL; } @@ -652,7 +652,7 @@ char *OutrageMusicSeq::alloc_and_copy_str(const char *str) { } // Music list management -OutrageMusicSeq::music_stream *OutrageMusicSeq::AddToList(short region, short theme_type, int len, +OutrageMusicSeq::music_stream *OutrageMusicSeq::AddToList(int16_t region, int16_t theme_type, int len, const music_ins *ins) { tListNode *node = new tListNode; @@ -682,7 +682,7 @@ void OutrageMusicSeq::FreeList() { m_music_list.free(); } -OutrageMusicSeq::music_stream *OutrageMusicSeq::GetSong(short region, short theme_type) { +OutrageMusicSeq::music_stream *OutrageMusicSeq::GetSong(int16_t region, int16_t theme_type) { tListNode *node = m_music_list.start(); music_stream *strm = NULL; int i; @@ -733,9 +733,9 @@ OutrageMusicSeq::music_stream *OutrageMusicSeq::GetSong(short region, short them //@@ while (init_strm != m_dominant_strm); //@@} -void OutrageMusicSeq::SetCurrentRegion(short region) { m_curregion = region; } +void OutrageMusicSeq::SetCurrentRegion(int16_t region) { m_curregion = region; } -short OutrageMusicSeq::GetCurrentRegion() const { return m_curregion; } +int16_t OutrageMusicSeq::GetCurrentRegion() const { return m_curregion; } // get current loop playing const char *OutrageMusicSeq::GetCurrentLoopName(int *count) { @@ -749,7 +749,7 @@ const char *OutrageMusicSeq::GetCurrentLoopName(int *count) { } // gets current region PLAYING, not PENDING like above. -short OutrageMusicSeq::GetPlayingRegion() const { +int16_t OutrageMusicSeq::GetPlayingRegion() const { if (m_playing_song) { return m_playing_song->region; } diff --git a/music/tracklist.cpp b/music/tracklist.cpp index 2025381c..5dd94347 100644 --- a/music/tracklist.cpp +++ b/music/tracklist.cpp @@ -56,7 +56,7 @@ oms_tracklist::oms_tracklist() { oms_tracklist::~oms_tracklist() { oms_tracklist::free(); } // initializes track list system -void oms_tracklist::init(short maxtracks) { +void oms_tracklist::init(int16_t maxtracks) { if (!m_init) { m_maxtracks = maxtracks; m_numtracks = 0; diff --git a/netcon/includes/CFtp.h b/netcon/includes/CFtp.h index 22bd3b92..f29d6f9d 100644 --- a/netcon/includes/CFtp.h +++ b/netcon/includes/CFtp.h @@ -57,6 +57,8 @@ #ifndef _CFTP_HEADER_ #define _CFTP_HEADER_ +#include + #define FTP_STATE_INTERNAL_ERROR 0 #define FTP_STATE_SOCKET_ERROR 1 #define FTP_STATE_URL_PARSING_ERROR 2 diff --git a/netcon/includes/Chttpget.h b/netcon/includes/Chttpget.h index 4cea18ac..efdc1a79 100644 --- a/netcon/includes/Chttpget.h +++ b/netcon/includes/Chttpget.h @@ -64,6 +64,8 @@ #ifndef _CHTTPGET_HEADER_ #define _CHTTPGET_HEADER_ +#include + #define HTTP_STATE_INTERNAL_ERROR 0 #define HTTP_STATE_SOCKET_ERROR 1 #define HTTP_STATE_URL_PARSING_ERROR 2 diff --git a/netcon/includes/inetgetfile.h b/netcon/includes/inetgetfile.h index 376255e2..0ba2d8f4 100644 --- a/netcon/includes/inetgetfile.h +++ b/netcon/includes/inetgetfile.h @@ -167,7 +167,7 @@ bool inet_LoadThreadLib(void); class InetGetFile { public: InetGetFile(char *URL, char *localfile); - InetGetFile(char *URL, char *localfile, char *proxyip, short proxyport); + InetGetFile(char *URL, char *localfile, char *proxyip, int16_t proxyport); ~InetGetFile(); BOOL IsFileReceived(); BOOL IsFileError(); diff --git a/netcon/inetfile/inetgetfile.cpp b/netcon/inetfile/inetgetfile.cpp index d1e6747c..7a303643 100644 --- a/netcon/inetfile/inetgetfile.cpp +++ b/netcon/inetfile/inetgetfile.cpp @@ -82,7 +82,7 @@ #include "Chttpget.h" extern char *Proxy_server; -extern short Proxy_port; +extern int16_t Proxy_port; #ifdef __LINUX__ /* ryan sez: use SDL. @@ -130,7 +130,7 @@ void InetGetFile::AbortGet() { } } -InetGetFile::InetGetFile(char *URL, char *localfile, char *proxyip, short proxyport) { +InetGetFile::InetGetFile(char *URL, char *localfile, char *proxyip, int16_t proxyport) { m_HardError = 0; http = NULL; ftp = NULL; diff --git a/netgames/anarchy/Anarchy.h b/netgames/anarchy/Anarchy.h index b9b7ac90..8c21282f 100644 --- a/netgames/anarchy/Anarchy.h +++ b/netgames/anarchy/Anarchy.h @@ -83,7 +83,7 @@ DLLEXPORT void DLLFUNCCALL DLLGetGameInfo(tDLLOptions *options); DLLEXPORT int DLLFUNCCALL GetGOScriptID(const char *name, uint8_t isdoor); DLLEXPORT void DLLFUNCCALLPTR CreateInstance(int id); DLLEXPORT void DLLFUNCCALL DestroyInstance(int id, void *ptr); -DLLEXPORT short DLLFUNCCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data); +DLLEXPORT int16_t DLLFUNCCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data); DLLEXPORT int DLLFUNCCALL SaveRestoreState(void *file_ptr, uint8_t saving_state); #ifdef __cplusplus } @@ -139,7 +139,7 @@ void DLLFUNCCALL DestroyInstance(int id, void *ptr) {} // the game for that event. This only pertains to certain events. If the chain continues // after this script, than the CONTINUE_DEFAULT setting will be overridden by lower priority // scripts return value. -short DLLFUNCCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data) { +int16_t DLLFUNCCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } diff --git a/netgames/coop/coop.h b/netgames/coop/coop.h index 552954d0..162c7e1c 100644 --- a/netgames/coop/coop.h +++ b/netgames/coop/coop.h @@ -92,7 +92,7 @@ DLLEXPORT void DLLFUNCCALL DLLGetGameInfo(tDLLOptions *options); DLLEXPORT int DLLFUNCCALL GetGOScriptID(const char *name, uint8_t isdoor); DLLEXPORT void DLLFUNCCALLPTR CreateInstance(int id); DLLEXPORT void DLLFUNCCALL DestroyInstance(int id, void *ptr); -DLLEXPORT short DLLFUNCCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data); +DLLEXPORT int16_t DLLFUNCCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data); DLLEXPORT int DLLFUNCCALL SaveRestoreState(void *file_ptr, uint8_t saving_state); #ifdef __cplusplus } @@ -148,7 +148,7 @@ void DLLFUNCCALL DestroyInstance(int id, void *ptr) {} // the game for that event. This only pertains to certain events. If the chain continues // after this script, than the CONTINUE_DEFAULT setting will be overridden by lower priority // scripts return value. -short DLLFUNCCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data) { +int16_t DLLFUNCCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } diff --git a/netgames/ctf/ctf.cpp b/netgames/ctf/ctf.cpp index d180b06f..0d559d64 100644 --- a/netgames/ctf/ctf.cpp +++ b/netgames/ctf/ctf.cpp @@ -876,7 +876,7 @@ void OnClientCollide(uint8_t *data) { // Did player collide with his own team's flag? if (fteam == pteam) { - short flag_count = 0; + int16_t flag_count = 0; vector fpos; int groom; int flagcount; diff --git a/netgames/ctf/ctf.h b/netgames/ctf/ctf.h index 47740d27..cb03211b 100644 --- a/netgames/ctf/ctf.h +++ b/netgames/ctf/ctf.h @@ -69,7 +69,7 @@ DLLEXPORT void DLLFUNCCALL DLLGetGameInfo(tDLLOptions *options); DLLEXPORT int DLLFUNCCALL GetGOScriptID(const char *name, uint8_t isdoor); DLLEXPORT void DLLFUNCCALLPTR CreateInstance(int id); DLLEXPORT void DLLFUNCCALL DestroyInstance(int id, void *ptr); -DLLEXPORT short DLLFUNCCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data); +DLLEXPORT int16_t DLLFUNCCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data); DLLEXPORT int DLLFUNCCALL SaveRestoreState(void *file_ptr, uint8_t saving_state); #ifdef __cplusplus } @@ -125,7 +125,7 @@ void DLLFUNCCALL DestroyInstance(int id, void *ptr) {} // the game for that event. This only pertains to certain events. If the chain continues // after this script, than the CONTINUE_DEFAULT setting will be overridden by lower priority // scripts return value. -short DLLFUNCCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data) { +int16_t DLLFUNCCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } diff --git a/netgames/dmfc/dmfcfunctions.cpp b/netgames/dmfc/dmfcfunctions.cpp index 9912ba8e..aeb1ab5e 100644 --- a/netgames/dmfc/dmfcfunctions.cpp +++ b/netgames/dmfc/dmfcfunctions.cpp @@ -201,7 +201,7 @@ DMFCFUNCTION int (*DLLcfeof)(CFILE *cfp); DMFCFUNCTION int (*DLLcfexist)(const char *filename); DMFCFUNCTION int (*DLLcf_ReadBytes)(uint8_t *buf, int count, CFILE *cfp); DMFCFUNCTION int (*DLLcf_ReadInt)(CFILE *cfp); -DMFCFUNCTION short (*DLLcf_ReadShort)(CFILE *cfp); +DMFCFUNCTION int16_t (*DLLcf_ReadShort)(CFILE *cfp); DMFCFUNCTION int8_t (*DLLcf_ReadByte)(CFILE *cfp); DMFCFUNCTION float (*DLLcf_ReadFloat)(CFILE *cfp); DMFCFUNCTION double (*DLLcf_ReadDouble)(CFILE *cfp); @@ -209,7 +209,7 @@ DMFCFUNCTION int (*DLLcf_ReadString)(char *buf, size_t n, CFILE *cfp); DMFCFUNCTION int (*DLLcf_WriteBytes)(const uint8_t *buf, int count, CFILE *cfp); DMFCFUNCTION int (*DLLcf_WriteString)(CFILE *cfp, const char *buf); DMFCFUNCTION void (*DLLcf_WriteInt)(CFILE *cfp, int i); -DMFCFUNCTION void (*DLLcf_WriteShort)(CFILE *cfp, short s); +DMFCFUNCTION void (*DLLcf_WriteShort)(CFILE *cfp, int16_t s); DMFCFUNCTION void (*DLLcf_WriteByte)(CFILE *cfp, int8_t b); DMFCFUNCTION void (*DLLcf_WriteFloat)(CFILE *cfp, float f); DMFCFUNCTION void (*DLLcf_WriteDouble)(CFILE *cfp, double d); @@ -342,7 +342,7 @@ DMFCFUNCTION bool (*DLLUnattachChild)(object *parent, char parent_ap); DMFCFUNCTION bool (*DLLUnattachFromParent)(object *child); DMFCFUNCTION float (*DLLvm_GetMagnitude)(vector *); DMFCFUNCTION void (*DLLvm_MatrixMulVector)(vector *, vector *, matrix *); -DMFCFUNCTION void (*DLLphys_apply_force)(object *obj, vector *force_vec, short weapon_index); +DMFCFUNCTION void (*DLLphys_apply_force)(object *obj, vector *force_vec, int16_t weapon_index); DMFCFUNCTION void (*DLLphys_apply_rot)(object *obj, vector *force_vec); DMFCFUNCTION void (*DLLvm_TransposeMatrix)(matrix *); DMFCFUNCTION void (*DLLvm_CrossProduct)(vector *, vector *, vector *); @@ -426,7 +426,7 @@ DMFCFUNCTION int (*DLLfvi_QuickDistFaceList)(int init_room_index, vector *pos, f fvi_face_room_list *quick_fr_list, int max_elements); DMFCFUNCTION int (*DLLfvi_QuickDistCellList)(int init_cell_index, vector *pos, float rad, int *quick_cell_list, int max_elements); -DMFCFUNCTION int (*DLLfvi_QuickDistObjectList)(vector *pos, int init_roomnum, float rad, short *object_index_list, +DMFCFUNCTION int (*DLLfvi_QuickDistObjectList)(vector *pos, int init_roomnum, float rad, int16_t *object_index_list, int max_elements, bool f_lightmap_only, bool f_only_players_and_ais, bool f_include_non_collide_objects, bool f_stop_at_closed_doors); DMFCFUNCTION bool (*DLLfvi_QuickRoomCheck)(vector *pos, room *cur_room, bool try_again); @@ -464,7 +464,7 @@ DMFCFUNCTION bool (*DLLg3_CheckNormalFacing)(vector *v, vector *norm); DMFCFUNCTION uint8_t (*DLLg3_RotatePoint)(g3Point *dest, vector *src); DMFCFUNCTION void (*DLLg3_ProjectPoint)(g3Point *point); DMFCFUNCTION float (*DLLg3_CalcPointDepth)(vector *pnt); -DMFCFUNCTION void (*DLLg3_Point2Vec)(vector *v, short sx, short sy); +DMFCFUNCTION void (*DLLg3_Point2Vec)(vector *v, int16_t sx, int16_t sy); DMFCFUNCTION uint8_t (*DLLg3_CodePoint)(g3Point *point); DMFCFUNCTION vector *(*DLLg3_RotateDeltaX)(vector *dest, float dx); DMFCFUNCTION vector *(*DLLg3_RotateDeltaY)(vector *dest, float dy); diff --git a/netgames/entropy/Entropy.h b/netgames/entropy/Entropy.h index 7e9723be..66444ad5 100644 --- a/netgames/entropy/Entropy.h +++ b/netgames/entropy/Entropy.h @@ -73,7 +73,7 @@ DLLEXPORT void DLLFUNCCALL DLLGetGameInfo(tDLLOptions *options); DLLEXPORT int DLLFUNCCALL GetGOScriptID(const char *name, uint8_t isdoor); DLLEXPORT void DLLFUNCCALLPTR CreateInstance(int id); DLLEXPORT void DLLFUNCCALL DestroyInstance(int id, void *ptr); -DLLEXPORT short DLLFUNCCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data); +DLLEXPORT int16_t DLLFUNCCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data); DLLEXPORT int DLLFUNCCALL SaveRestoreState(void *file_ptr, uint8_t saving_state); } @@ -136,7 +136,7 @@ void DLLFUNCCALL DestroyInstance(int id, void *ptr) {} // the game for that event. This only pertains to certain events. If the chain continues // after this script, than the CONTINUE_DEFAULT setting will be overridden by lower priority // scripts return value. -short DLLFUNCCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data) { +int16_t DLLFUNCCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } diff --git a/netgames/hoard/Hoard.h b/netgames/hoard/Hoard.h index 40fa9160..cb5b504b 100644 --- a/netgames/hoard/Hoard.h +++ b/netgames/hoard/Hoard.h @@ -66,7 +66,7 @@ DLLEXPORT void DLLFUNCCALL DLLGetGameInfo(tDLLOptions *options); DLLEXPORT int DLLFUNCCALL GetGOScriptID(const char *name, uint8_t isdoor); DLLEXPORT void DLLFUNCCALLPTR CreateInstance(int id); DLLEXPORT void DLLFUNCCALL DestroyInstance(int id, void *ptr); -DLLEXPORT short DLLFUNCCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data); +DLLEXPORT int16_t DLLFUNCCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data); DLLEXPORT int DLLFUNCCALL SaveRestoreState(void *file_ptr, uint8_t saving_state); #ifdef __cplusplus } @@ -122,7 +122,7 @@ void DLLFUNCCALL DestroyInstance(int id, void *ptr) {} // the game for that event. This only pertains to certain events. If the chain continues // after this script, than the CONTINUE_DEFAULT setting will be overridden by lower priority // scripts return value. -short DLLFUNCCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data) { +int16_t DLLFUNCCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } diff --git a/netgames/hyperanarchy/HyperAnarchy.h b/netgames/hyperanarchy/HyperAnarchy.h index 48bfcedb..70b5d1da 100644 --- a/netgames/hyperanarchy/HyperAnarchy.h +++ b/netgames/hyperanarchy/HyperAnarchy.h @@ -58,7 +58,7 @@ DLLEXPORT void DLLFUNCCALL DLLGetGameInfo(tDLLOptions *options); DLLEXPORT int DLLFUNCCALL GetGOScriptID(const char *name, uint8_t isdoor); DLLEXPORT void DLLFUNCCALLPTR CreateInstance(int id); DLLEXPORT void DLLFUNCCALL DestroyInstance(int id, void *ptr); -DLLEXPORT short DLLFUNCCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data); +DLLEXPORT int16_t DLLFUNCCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data); DLLEXPORT int DLLFUNCCALL SaveRestoreState(void *file_ptr, uint8_t saving_state); #ifdef __cplusplus } @@ -114,7 +114,7 @@ void DLLFUNCCALL DestroyInstance(int id, void *ptr) {} // the game for that event. This only pertains to certain events. If the chain continues // after this script, than the CONTINUE_DEFAULT setting will be overridden by lower priority // scripts return value. -short DLLFUNCCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data) { +int16_t DLLFUNCCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } diff --git a/netgames/includes/gamedll_header.h b/netgames/includes/gamedll_header.h index 2843e3cf..e9fe8ef2 100644 --- a/netgames/includes/gamedll_header.h +++ b/netgames/includes/gamedll_header.h @@ -429,9 +429,9 @@ DMFCDLLOUT(cf_ReadBytes_fp DLLcf_ReadBytes;) typedef int (*cf_ReadInt_fp)(CFILE *cfp); DMFCDLLOUT(cf_ReadInt_fp DLLcf_ReadInt;) -// Read and return a short (16 bits) +// Read and return a int16_t (16 bits) // Throws an exception of type (cfile_error *) if the OS returns an error on read -typedef short (*cf_ReadShort_fp)(CFILE *cfp); +typedef int16_t (*cf_ReadShort_fp)(CFILE *cfp); DMFCDLLOUT(cf_ReadShort_fp DLLcf_ReadShort;) // Read and return a byte (8 bits) @@ -484,9 +484,9 @@ DMFCDLLOUT(cf_WriteString_fp DLLcf_WriteString;) typedef void (*cf_WriteInt_fp)(CFILE *cfp, int i); DMFCDLLOUT(cf_WriteInt_fp DLLcf_WriteInt;) -// Write a short (16 bits) +// Write a int16_t (16 bits) // Throws an exception of type (cfile_error *) if the OS returns an error on write -typedef void (*cf_WriteShort_fp)(CFILE *cfp, short s); +typedef void (*cf_WriteShort_fp)(CFILE *cfp, int16_t s); DMFCDLLOUT(cf_WriteShort_fp DLLcf_WriteShort;) // Write a byte (8 bits). If the byte is a newline & the file is a text file, writes a CR/LF pair. @@ -976,8 +976,8 @@ DMFCDLLOUT(vm_MatrixMulVector_fp DLLvm_MatrixMulVector;) // Applies an instantaneous force on an object, resulting in an instantaneous // change in velocity. -// typedef void (*phys_apply_force_fp)(object *obj,vector *force_vec,short weapon_index=-1); -typedef void (*phys_apply_force_fp)(object *obj, vector *force_vec, short weapon_index); +// typedef void (*phys_apply_force_fp)(object *obj,vector *force_vec,int16_t weapon_index=-1); +typedef void (*phys_apply_force_fp)(object *obj, vector *force_vec, int16_t weapon_index); DMFCDLLOUT(phys_apply_force_fp DLLphys_apply_force;) typedef void (*phys_apply_rot_fp)(object *obj, vector *force_vec); @@ -1332,10 +1332,10 @@ typedef int (*fvi_QuickDistCellList_fp)(int init_cell_index, vector *pos, float DMFCDLLOUT(fvi_QuickDistCellList_fp DLLfvi_QuickDistCellList;) // Returns the number of objects that are approximately within the specified radius -// typedef int (*fvi_QuickDistObjectList_fp)(vector *pos, int init_roomnum, float rad, short *object_index_list, int +// typedef int (*fvi_QuickDistObjectList_fp)(vector *pos, int init_roomnum, float rad, int16_t *object_index_list, int // max_elements, bool f_lightmap_only, bool f_only_players_and_ais = false, bool f_include_non_collide_objects = false, // bool f_stop_at_closed_doors = false); -typedef int (*fvi_QuickDistObjectList_fp)(vector *pos, int init_roomnum, float rad, short *object_index_list, +typedef int (*fvi_QuickDistObjectList_fp)(vector *pos, int init_roomnum, float rad, int16_t *object_index_list, int max_elements, bool f_lightmap_only, bool f_only_players_and_ais, bool f_include_non_collide_objects, bool f_stop_at_closed_doors); DMFCDLLOUT(fvi_QuickDistObjectList_fp DLLfvi_QuickDistObjectList;) @@ -1489,7 +1489,7 @@ typedef float (*g3_CalcPointDepth_fp)(vector *pnt); DMFCDLLOUT(g3_CalcPointDepth_fp DLLg3_CalcPointDepth;) // from a 2d point, compute the vector through that point -typedef void (*g3_Point2Vec_fp)(vector *v, short sx, short sy); +typedef void (*g3_Point2Vec_fp)(vector *v, int16_t sx, int16_t sy); DMFCDLLOUT(g3_Point2Vec_fp DLLg3_Point2Vec;) // code a point. fills in the p3_codes field of the point, and returns the codes diff --git a/netgames/monsterball/monsterball.h b/netgames/monsterball/monsterball.h index 352f00b3..9161d69c 100644 --- a/netgames/monsterball/monsterball.h +++ b/netgames/monsterball/monsterball.h @@ -92,7 +92,7 @@ DLLEXPORT void DLLFUNCCALL DLLGetGameInfo(tDLLOptions *options); DLLEXPORT int DLLFUNCCALL GetGOScriptID(const char *name, uint8_t isdoor); DLLEXPORT void DLLFUNCCALLPTR CreateInstance(int id); DLLEXPORT void DLLFUNCCALL DestroyInstance(int id, void *ptr); -DLLEXPORT short DLLFUNCCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data); +DLLEXPORT int16_t DLLFUNCCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data); DLLEXPORT int DLLFUNCCALL SaveRestoreState(void *file_ptr, uint8_t saving_state); } @@ -145,7 +145,7 @@ void DLLFUNCCALL DestroyInstance(int id, void *ptr) {} // the game for that event. This only pertains to certain events. If the chain continues // after this script, than the CONTINUE_DEFAULT setting will be overridden by lower priority // scripts return value. -short DLLFUNCCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data) { +int16_t DLLFUNCCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } diff --git a/netgames/roboanarchy/roboAnarchy.h b/netgames/roboanarchy/roboAnarchy.h index e5ab9ee1..31aef00a 100644 --- a/netgames/roboanarchy/roboAnarchy.h +++ b/netgames/roboanarchy/roboAnarchy.h @@ -83,7 +83,7 @@ DLLEXPORT void DLLFUNCCALL DLLGetGameInfo(tDLLOptions *options); DLLEXPORT int DLLFUNCCALL GetGOScriptID(const char *name, uint8_t isdoor); DLLEXPORT void DLLFUNCCALLPTR CreateInstance(int id); DLLEXPORT void DLLFUNCCALL DestroyInstance(int id, void *ptr); -DLLEXPORT short DLLFUNCCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data); +DLLEXPORT int16_t DLLFUNCCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data); DLLEXPORT int DLLFUNCCALL SaveRestoreState(void *file_ptr, uint8_t saving_state); #ifdef __cplusplus } @@ -139,7 +139,7 @@ void DLLFUNCCALL DestroyInstance(int id, void *ptr) {} // the game for that event. This only pertains to certain events. If the chain continues // after this script, than the CONTINUE_DEFAULT setting will be overridden by lower priority // scripts return value. -short DLLFUNCCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data) { +int16_t DLLFUNCCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } diff --git a/netgames/tanarchy/tanDMFC.h b/netgames/tanarchy/tanDMFC.h index c64822e4..432c2eb8 100644 --- a/netgames/tanarchy/tanDMFC.h +++ b/netgames/tanarchy/tanDMFC.h @@ -47,7 +47,7 @@ DLLEXPORT void DLLFUNCCALL DLLGetGameInfo(tDLLOptions *options); DLLEXPORT int DLLFUNCCALL GetGOScriptID(const char *name, uint8_t isdoor); DLLEXPORT void DLLFUNCCALLPTR CreateInstance(int id); DLLEXPORT void DLLFUNCCALL DestroyInstance(int id, void *ptr); -DLLEXPORT short DLLFUNCCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data); +DLLEXPORT int16_t DLLFUNCCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data); DLLEXPORT int DLLFUNCCALL SaveRestoreState(void *file_ptr, uint8_t saving_state); } @@ -101,7 +101,7 @@ void DLLFUNCCALL DestroyInstance(int id, void *ptr) {} // the game for that event. This only pertains to certain events. If the chain continues // after this script, than the CONTINUE_DEFAULT setting will be overridden by lower priority // scripts return value. -short DLLFUNCCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data) { +int16_t DLLFUNCCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } diff --git a/networking/networking.cpp b/networking/networking.cpp index d647c2ad..bd6fcd38 100644 --- a/networking/networking.cpp +++ b/networking/networking.cpp @@ -413,7 +413,7 @@ typedef struct network_packet_buffer { #define MAX_PACKET_BUFFERS 96 static network_packet_buffer Packet_buffers[MAX_PACKET_BUFFERS]; // buffer to hold packets sent to us -static short Packet_free_list[MAX_PACKET_BUFFERS]; // contains id's of free packet buffers +static int16_t Packet_free_list[MAX_PACKET_BUFFERS]; // contains id's of free packet buffers static int Num_packet_buffers; static int Largest_packet_index = 0; @@ -491,8 +491,8 @@ static uint32_t serverconn = 0xFFFFFFFF; typedef struct { float timesent[MAXNETBUFFERS]; - short send_len[MAXNETBUFFERS]; - short recv_len[MAXNETBUFFERS]; + int16_t send_len[MAXNETBUFFERS]; + int16_t recv_len[MAXNETBUFFERS]; float last_packet_received; // For a given connection, this is the last packet we received float last_packet_sent; float pings[MAX_PING_HISTORY]; @@ -930,7 +930,7 @@ void nw_HandleUnreliableData(uint8_t *data, int len, network_address *from_addr) // routine to "free" a packet buffer void nw_FreePacket(int id) { Packet_buffers[id].sequence_number = -1; - Packet_free_list[--Num_packet_buffers] = (short)id; + Packet_free_list[--Num_packet_buffers] = (int16_t)id; if (Largest_packet_index == id) while ((--Largest_packet_index > 0) && (Packet_buffers[Largest_packet_index].sequence_number == -1)) ; @@ -1219,7 +1219,7 @@ void nw_SendReliableAck(SOCKADDR *raddr, uint32_t sig, network_protocol link_typ reliable_header ack_header; ack_header.type = RNT_ACK; // mprintf((0,"Sending ACK for sig %d.\n",sig)); - ack_header.data_len = INTEL_SHORT((short)sizeof(uint32_t)); + ack_header.data_len = INTEL_SHORT((int16_t)sizeof(uint32_t)); ack_header.send_time = INTEL_FLOAT(time_sent); sig = INTEL_INT(sig); memcpy(&ack_header.data, &sig, sizeof(uint32_t)); @@ -1252,7 +1252,7 @@ void nw_DoNetworkIdle(void) { void nw_WorkReliable(uint8_t *data, int len, network_address *naddr) { int i; int rcode = -1; - short max_len = NETBUFFERSIZE; + int16_t max_len = NETBUFFERSIZE; static reliable_header rcv_buff; static SOCKADDR rcv_addr; int bytesin = 0; @@ -1278,8 +1278,8 @@ void nw_WorkReliable(uint8_t *data, int len, network_address *naddr) { reliable_header conn_header; // Now send I_AM_HERE packet conn_header.type = RNT_I_AM_HERE; - conn_header.seq = INTEL_SHORT((short)(~CONNECTSEQ)); - conn_header.data_len = INTEL_SHORT((short)0); + conn_header.seq = INTEL_SHORT((int16_t)(~CONNECTSEQ)); + conn_header.data_len = INTEL_SHORT((int16_t)0); last_sent_iamhere = timer_GetTime(); network_address send_address; memset(&send_address, 0, sizeof(network_address)); @@ -1549,8 +1549,8 @@ void nw_HandleConnectResponse(uint8_t *data, int len, network_address *server_ad mprintf((0, "Succesfully connected to server in nw_ConnectToServer().\n")); // Now send I_AM_HERE packet conn_header.type = RNT_I_AM_HERE; - conn_header.seq = INTEL_SHORT((short)(~CONNECTSEQ)); - conn_header.data_len = INTEL_SHORT((short)0); + conn_header.seq = INTEL_SHORT((int16_t)(~CONNECTSEQ)); + conn_header.data_len = INTEL_SHORT((int16_t)0); serverconn = i; first_sent_iamhere = timer_GetTime(); last_sent_iamhere = timer_GetTime(); @@ -1616,7 +1616,7 @@ void nw_ConnectToServer(SOCKET *socket, network_address *server_addr) { } conn_header.type = RNT_REQ_CONN; - conn_header.seq = INTEL_SHORT((short)CONNECTSEQ); + conn_header.seq = INTEL_SHORT((int16_t)CONNECTSEQ); conn_header.data_len = 0; timeout.tv_sec = 0; @@ -1699,7 +1699,7 @@ void nw_CloseSocket(SOCKET *sockp) { } } diss_conn_header.type = RNT_DISCONNECT; - diss_conn_header.seq = INTEL_SHORT((short)(CONNECTSEQ)); + diss_conn_header.seq = INTEL_SHORT((int16_t)(CONNECTSEQ)); diss_conn_header.data_len = 0; if (*sockp == serverconn) serverconn = -1; @@ -2318,7 +2318,7 @@ int nw_SendWithID(uint8_t id, uint8_t *data, int len, network_address *who_to) { int ret, send_len; uint8_t iaddr[6], *send_data; - short port; + int16_t port; fd_set wfds; ASSERT(data); @@ -2518,7 +2518,7 @@ int nw_DoReceiveCallbacks(void) { void nw_ReliableResend(void) { int i, j; int rcode = -1; - short max_len = NETBUFFERSIZE; + int16_t max_len = NETBUFFERSIZE; static reliable_header rcv_buff; static SOCKADDR rcv_addr; int bytesin = 0; @@ -2614,8 +2614,8 @@ void nw_ReliableResend(void) { reliable_header send_header; // mprintf((0,"Resending reliable packet in nw_WorkReliable().\n")); send_header.send_time = INTEL_FLOAT(timer_GetTime()); - send_header.seq = INTEL_SHORT((short)0); - send_header.data_len = INTEL_SHORT((short)0); + send_header.seq = INTEL_SHORT((int16_t)0); + send_header.data_len = INTEL_SHORT((int16_t)0); send_header.type = RNT_HEARTBEAT; rcode = -1; diff --git a/physics/FindIntersection.cpp b/physics/FindIntersection.cpp index 86bdb54c..bbbaf0e2 100644 --- a/physics/FindIntersection.cpp +++ b/physics/FindIntersection.cpp @@ -381,7 +381,7 @@ * * 115 3/23/98 11:18a Chris * Added int fvi_QuickDistObjectList(vector *pos, int init_room_index, - * float rad, short *object_index_list, int max_elements) + * float rad, int16_t *object_index_list, int max_elements) * * * 114 3/18/98 10:12p Chris @@ -1981,12 +1981,12 @@ int fvi_QuickDistFaceList(int init_room_index, vector *pos, float rad, fvi_face_ msector |= 0x20; } - const short num_bbf_regions = cur_room->num_bbf_regions; - short *num_faces_ptr = cur_room->num_bbf; + const int16_t num_bbf_regions = cur_room->num_bbf_regions; + int16_t *num_faces_ptr = cur_room->num_bbf; uint8_t *bbf_val = cur_room->bbf_list_sector; vector *region_min = cur_room->bbf_list_min_xyz; vector *region_max = cur_room->bbf_list_max_xyz; - short **bbf_list_ptr = cur_room->bbf_list; + int16_t **bbf_list_ptr = cur_room->bbf_list; // Do the actual wall collsion stuff here! for (int test1 = 0; test1 < num_bbf_regions; test1++) { @@ -1995,7 +1995,7 @@ int fvi_QuickDistFaceList(int init_room_index, vector *pos, float rad, fvi_face_ region_max->x < min_xyz.x || region_max->y < min_xyz.y || region_max->z < min_xyz.z) goto skip_region; - short *cur_face_index_ptr = *bbf_list_ptr; + int16_t *cur_face_index_ptr = *bbf_list_ptr; for (int sort_list_cur = 0; sort_list_cur < (*num_faces_ptr); sort_list_cur++) { i = *cur_face_index_ptr; @@ -2112,7 +2112,7 @@ int fvi_QuickDistCellList(int init_cell_index, vector *pos, float rad, int *quic return num_cells; } -int fvi_QuickDistObjectList(vector *pos, int init_room_index, float rad, short *object_index_list, int max_elements, +int fvi_QuickDistObjectList(vector *pos, int init_room_index, float rad, int16_t *object_index_list, int max_elements, bool f_lightmap_only, bool f_only_players_and_ais, bool f_include_non_collide_objects, bool f_stop_at_closed_doors) { int num_objects = 0; @@ -2369,12 +2369,12 @@ internal_try_again: msector |= 0x20; } - const short num_bbf_regions = cur_room->num_bbf_regions; - short *num_faces_ptr = cur_room->num_bbf; + const int16_t num_bbf_regions = cur_room->num_bbf_regions; + int16_t *num_faces_ptr = cur_room->num_bbf; uint8_t *bbf_val = cur_room->bbf_list_sector; vector *region_min = cur_room->bbf_list_min_xyz; vector *region_max = cur_room->bbf_list_max_xyz; - short **bbf_list_ptr = cur_room->bbf_list; + int16_t **bbf_list_ptr = cur_room->bbf_list; // Do the actual wall collsion stuff here! for (int test1 = 0; test1 < num_bbf_regions; test1++) { @@ -2383,7 +2383,7 @@ internal_try_again: region_max->x < min_xyz.x || region_max->y < min_xyz.y || region_max->z < min_xyz.z) goto skip_region; - short *cur_face_index_ptr = *bbf_list_ptr; + int16_t *cur_face_index_ptr = *bbf_list_ptr; for (int sort_list_cur = 0; sort_list_cur < (*num_faces_ptr); sort_list_cur++) { i = *cur_face_index_ptr; @@ -2393,7 +2393,7 @@ internal_try_again: vector *vertex_ptr_list[MAX_VERTS_PER_FACE]; int face_hit_type; vector wall_norm; - short count; + int16_t count; bool f_backface; if (cur_room->faces[i].flags & FF_NOT_SHELL) @@ -2546,7 +2546,7 @@ void make_trigger_face_list(int last_sim_faces) { vector wall_norm; vector colp; vector hit_point; - short count; + int16_t count; room *cur_room = &Rooms[Fvi_recorded_faces[x].room_index]; int i = Fvi_recorded_faces[x].face_index; float cur_dist; @@ -3000,7 +3000,7 @@ bool BBoxPlaneIntersection(bool fast_exit, vector *collision_point, vector *coll int num_int_poly = 0; vector int_points_box[12]; vector int_points_poly[32]; - short int_faces = 0; + int16_t int_faces = 0; bool f_int_box = false; bool f_int_poly = false; @@ -4461,7 +4461,7 @@ int fvi_room(int room_index, int from_portal, int room_obj) { vector hit_point; // where we hit float cur_dist; // distance to hit point const room *cur_room = &Rooms[room_index]; - short i; + int16_t i; int next_portals[MAX_NEXT_PORTALS]; int num_next_portals = 0; int next_portal_index; @@ -4511,7 +4511,7 @@ int fvi_room(int room_index, int from_portal, int room_obj) { if (fvi_query_ptr->flags & FQ_IGNORE_WALLS) { vector face_normal; vector *vertex_ptr_list[MAX_VERTS_PER_FACE]; - short count; + int16_t count; bool f_backface; int face_info; int j; //, k; @@ -4568,12 +4568,12 @@ int fvi_room(int room_index, int from_portal, int room_obj) { } } } else { - const short num_bbf_regions = cur_room->num_bbf_regions; - short *num_faces_ptr = cur_room->num_bbf; + const int16_t num_bbf_regions = cur_room->num_bbf_regions; + int16_t *num_faces_ptr = cur_room->num_bbf; uint8_t *bbf_val = cur_room->bbf_list_sector; vector *region_min = cur_room->bbf_list_min_xyz; vector *region_max = cur_room->bbf_list_max_xyz; - short **bbf_list_ptr = cur_room->bbf_list; + int16_t **bbf_list_ptr = cur_room->bbf_list; // Do the actual wall collsion stuff here! for (int test1 = 0; test1 < num_bbf_regions; test1++) { @@ -4587,7 +4587,7 @@ int fvi_room(int room_index, int from_portal, int room_obj) { (float *)&fvi_movement_delta) == false) goto skip_region; - short *cur_face_index_ptr = *bbf_list_ptr; + int16_t *cur_face_index_ptr = *bbf_list_ptr; for (int sort_list_cur = 0; sort_list_cur < (*num_faces_ptr); sort_list_cur++) { vector face_normal; @@ -4595,7 +4595,7 @@ int fvi_room(int room_index, int from_portal, int room_obj) { int face_hit_type; vector wall_norm; vector colp; - short count; + int16_t count; bool f_backface; int face_info; face *cur_face; diff --git a/physics/physics.cpp b/physics/physics.cpp index 8772d035..12e6dbc2 100644 --- a/physics/physics.cpp +++ b/physics/physics.cpp @@ -401,9 +401,9 @@ bool PhysicsDoSimRot(object *obj, float frame_time, matrix *orient, vector *rott // Fixed rate rotaters if (obj->mtype.phys_info.flags & PF_FIXED_ROT_VELOCITY) { - tangles.p = (short)(rotvel->x * frame_time); - tangles.h = (short)(rotvel->y * frame_time); - tangles.b = (short)(rotvel->z * frame_time); + tangles.p = (int16_t)(rotvel->x * frame_time); + tangles.h = (int16_t)(rotvel->y * frame_time); + tangles.b = (int16_t)(rotvel->z * frame_time); vm_AnglesToMatrix(&rotmat, tangles.p, tangles.h, tangles.b); *orient = *orient * rotmat; // ObjSetOrient below @@ -665,9 +665,9 @@ bool PhysicsDoSimRot(object *obj, float frame_time, matrix *orient, vector *rott } // Apply rotation to the "un-rollbanked" object - tangles.p = (short)(rotvel->x * frame_time); // Casting to short is required for aarch64 to avoid FCVTZU instruction which strips the negative sign - tangles.h = (short)(rotvel->y * frame_time); - tangles.b = (short)(rotvel->z * frame_time); + tangles.p = (int16_t)(rotvel->x * frame_time); // Casting to int16_t is required for aarch64 to avoid FCVTZU instruction which strips the negative sign + tangles.h = (int16_t)(rotvel->y * frame_time); + tangles.b = (int16_t)(rotvel->z * frame_time); vm_AnglesToMatrix(&rotmat, tangles.p, tangles.h, tangles.b); *orient = *orient * rotmat; // ObjSetOrient is below @@ -2989,7 +2989,7 @@ void do_vis_physics_sim(vis_effect *vis) { DebugBlockPrint("DV"); } -void phys_apply_force(object *obj, vector *force_vec, short weapon_index) { +void phys_apply_force(object *obj, vector *force_vec, int16_t weapon_index) { if (obj->mtype.phys_info.mass == 0.0) return; diff --git a/renderer/HardwarePoints.cpp b/renderer/HardwarePoints.cpp index 6acf4919..664f50c5 100644 --- a/renderer/HardwarePoints.cpp +++ b/renderer/HardwarePoints.cpp @@ -87,7 +87,7 @@ void g3_ProjectPoint(g3Point *p) { } // from a 2d point, compute the vector through that point -void g3_Point2Vec(vector *v, short sx, short sy) { +void g3_Point2Vec(vector *v, int16_t sx, int16_t sy) { vector tempv; matrix tempm; diff --git a/scripts/AIGame.cpp b/scripts/AIGame.cpp index ecaf25e5..712d7940 100644 --- a/scripts/AIGame.cpp +++ b/scripts/AIGame.cpp @@ -36,7 +36,7 @@ DLLEXPORT void STDCALL ShutdownDLL(void); DLLEXPORT int STDCALL GetGOScriptID(const char *name, uint8_t isdoor); DLLEXPORT void STDCALLPTR CreateInstance(int id); DLLEXPORT void STDCALL DestroyInstance(int id, void *ptr); -DLLEXPORT short STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data); +DLLEXPORT int16_t STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data); DLLEXPORT int STDCALL SaveRestoreState(void *file_ptr, uint8_t saving_state); #ifdef __cplusplus } @@ -344,7 +344,7 @@ class BaseObjScript { public: BaseObjScript(); ~BaseObjScript(); - virtual short CallEvent(int event, tOSIRISEventInfo *data); + virtual int16_t CallEvent(int event, tOSIRISEventInfo *data); }; typedef struct { @@ -367,7 +367,7 @@ private: public: Pest() {} - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; //------------------ @@ -392,7 +392,7 @@ private: public: Stinger() { memory = NULL; } - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; //------------------ @@ -460,7 +460,7 @@ private: public: SuperThief() { memory = NULL; } - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; //------------------ @@ -495,7 +495,7 @@ typedef struct humonculous_data { int rocks[5]; - short flags; + int16_t flags; } humonculous_data; class Humonculous : public BaseObjScript { @@ -510,7 +510,7 @@ private: public: Humonculous() { memory = NULL; } - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; //------------------ @@ -536,7 +536,7 @@ private: public: Dragon() { memory = NULL; } - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; //---------------- @@ -556,7 +556,7 @@ private: public: Tracker() { memory = NULL; } - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; //------------------ @@ -578,7 +578,7 @@ private: public: Lance() {} - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; //------------------ @@ -597,7 +597,7 @@ private: public: Flak() {} - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; //------------------ @@ -611,7 +611,7 @@ private: public: Seeker() {} - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; //------------------ @@ -629,7 +629,7 @@ private: public: SuperTrooper() {} - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; //------------------ @@ -675,7 +675,7 @@ private: public: Sparky() {} - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; //------------------ @@ -738,7 +738,7 @@ private: public: Hellion() {} - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; //------------------ @@ -812,7 +812,7 @@ private: public: MantaRay() {} - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; //------------------ @@ -859,7 +859,7 @@ private: public: Skiff() {} - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; //------------------ @@ -902,7 +902,7 @@ private: public: SpyHunter() {} - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; //------------------ @@ -930,7 +930,7 @@ class Sniper : public BaseObjScript { public: Sniper() {} - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; //------------------ @@ -958,7 +958,7 @@ class SniperNoRun : public BaseObjScript { public: SniperNoRun() {} - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; //------------------ @@ -983,7 +983,7 @@ class EvaderModA : public BaseObjScript { public: EvaderModA() {} - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; //------------------ @@ -1011,7 +1011,7 @@ class FlameRAS : public BaseObjScript { public: FlameRAS() {} - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; //----------------- @@ -1049,7 +1049,7 @@ private: public: Jugg() {} - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; //----------------- @@ -1074,7 +1074,7 @@ private: public: DTower() {} - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; //----------------- @@ -1097,7 +1097,7 @@ private: public: DCollector() {} - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; //----------------- @@ -1117,7 +1117,7 @@ private: public: CBall() {} - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; //----------------- @@ -1138,7 +1138,7 @@ private: public: SixGun() {} - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; //----------------- @@ -1155,7 +1155,7 @@ private: void DoInit(int me_handle); public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; //----------------- @@ -1196,7 +1196,7 @@ private: public: Sickle() {} - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; //----------------- @@ -1210,7 +1210,7 @@ typedef struct { class BettyBomb : public BaseObjScript { public: BettyBomb() { memory = NULL; } - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); private: tBettyBombInfo *memory; @@ -1224,7 +1224,7 @@ typedef struct { class BettyScript : public BaseObjScript { public: BettyScript() { memory = NULL; } - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); protected: void DoInit(int me); @@ -1244,7 +1244,7 @@ typedef struct { class ChaffScript : public BaseObjScript { public: ChaffScript() { memory = NULL; } - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); protected: void DoInit(int me); @@ -1262,7 +1262,7 @@ typedef struct { class ChaffChunkScript : public BaseObjScript { public: ChaffChunkScript() { memory = NULL; } - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); protected: void DoInit(int me); @@ -1284,7 +1284,7 @@ private: public: ProxMine() {} - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; //------------------ @@ -1294,7 +1294,7 @@ public: class Gunboy : public BaseObjScript { public: Gunboy() {} - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; //----------------- @@ -1315,7 +1315,7 @@ private: public: GBPowerup() {} - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; //----------------- @@ -1337,7 +1337,7 @@ private: public: JoshBell() {} - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; //----------------- @@ -1350,7 +1350,7 @@ private: public: ExplodeOnContact() {} - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; //----------------- @@ -1363,7 +1363,7 @@ private: public: DestroyOnContact() {} - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; //----------------- @@ -1591,7 +1591,7 @@ private: public: GuideBot() { memory = NULL; } - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; //----------------- @@ -1727,7 +1727,7 @@ private: public: Thief() {} - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; //----------------- @@ -2255,7 +2255,7 @@ void SuperThief::DoInterval(int me) { memory->mode_time += Game_GetFrameTime(); } -short SuperThief::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t SuperThief::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_AI_INIT: DoInit(data->me_handle); @@ -2307,7 +2307,7 @@ private: public: FireAtDist() {} - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; //----------------- @@ -2327,7 +2327,7 @@ private: public: HatePTMC() {} - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; //----------------- @@ -2351,7 +2351,7 @@ private: public: Tubbs() {} - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; //----------------- @@ -2376,7 +2376,7 @@ private: public: OldScratch() {} - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; //----------------- @@ -2442,7 +2442,7 @@ private: public: BarnSwallow() {} - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; //---------------- @@ -2763,7 +2763,7 @@ void STDCALL DestroyInstance(int id, void *ptr) { } } -short STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data) { +int16_t STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data) { return ((BaseObjScript *)ptr)->CallEvent(event, data); } @@ -2813,7 +2813,7 @@ BaseObjScript::BaseObjScript() {} BaseObjScript::~BaseObjScript() {} -short BaseObjScript::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } +int16_t BaseObjScript::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } //----------------- // Josh Bell @@ -2842,7 +2842,7 @@ void JoshBell::DoCollide(int me) { } } -short JoshBell::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t JoshBell::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: DoInit(data->me_handle); @@ -2877,7 +2877,7 @@ void ExplodeOnContact::DoCollide(int me, int it) { } } -short ExplodeOnContact::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t ExplodeOnContact::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: DoCollide(data->me_handle, data->evt_collide.it_handle); @@ -2901,7 +2901,7 @@ void DestroyOnContact::DoCollide(int me, int it) { } } -short DestroyOnContact::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t DestroyOnContact::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: DoCollide(data->me_handle, data->evt_collide.it_handle); @@ -2933,7 +2933,7 @@ void Pest::DoInit(int me) { AI_SetType(me, AIT_EVADER1); } -short Pest::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t Pest::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_AI_INIT: DoInit(data->me_handle); @@ -3039,7 +3039,7 @@ void Stinger::DoInterval(int me) { } } -short Stinger::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t Stinger::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_AI_INIT: DoInit(data->me_handle); @@ -3076,7 +3076,7 @@ short Stinger::CallEvent(int event, tOSIRISEventInfo *data) { #define H_DOOR_WAIT_TIME 8.0f // Valid next modes from each mode (Humonculous Mode Valid Next) -const short hm_valid_next_modes[11] = { +const int16_t hm_valid_next_modes[11] = { (HM_INTRO_CUTSCENE), (HM_RANGED | HM_MELEE | HM_WALL_HIT | HM_MID_DAMAGE_TAUNT | HM_ABOUT_TO_FAKE_DEATH), (HM_RANGED | HM_MELEE | HM_WALL_HIT | HM_MID_DAMAGE_TAUNT | HM_ABOUT_TO_FAKE_DEATH), @@ -3791,7 +3791,7 @@ void Humonculous::DoInterval(int me) { memory->mode_time += Game_GetFrameTime(); } -short Humonculous::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t Humonculous::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_AI_INIT: DoInit(data->me_handle); @@ -3838,7 +3838,7 @@ void Dragon::DoInit(int me) { AI_SetType(me, AIT_EVADER1); } -short Dragon::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t Dragon::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_AI_INIT: DoInit(data->me_handle); @@ -3890,7 +3890,7 @@ void Tracker::DoInit(int me) { AI_SetType(me, AIT_EVADER1); } -short Tracker::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t Tracker::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_AI_INIT: DoInit(data->me_handle); @@ -3953,7 +3953,7 @@ void Lance::DoFrame(int me) { } } -short Lance::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t Lance::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_AI_INIT: DoInit(data->me_handle); @@ -3987,7 +3987,7 @@ void Flak::DoInit(int me) { AI_SetType(me, AIT_EVADER1); } -short Flak::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t Flak::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_AI_INIT: DoInit(data->me_handle); @@ -4071,7 +4071,7 @@ void SuperTrooper::DoInit(int me) { AI_SetType(me, AIT_EVADER1); } -short SuperTrooper::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t SuperTrooper::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_INTERVAL: { int body_handle = Obj_GetAttachChildHandle(data->me_handle, 0); @@ -4222,7 +4222,7 @@ void Jugg::DoFrame(int me) { memory->last_frame = current_anim_frame; } -short Jugg::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t Jugg::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_AI_INIT: DoInit(data->me_handle); @@ -4334,7 +4334,7 @@ void DTower::DoFrame(int me) { memory->last_frame = current_anim_frame; } -short DTower::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t DTower::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_AI_INIT: DoInit(data->me_handle); @@ -4394,7 +4394,7 @@ void DCollector::DoFrame(int me) { } } -short DCollector::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t DCollector::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_AI_INIT: DoInit(data->me_handle); @@ -4446,7 +4446,7 @@ void CBall::DoFrame(int me) { } } -short CBall::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CBall::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: DoInit(data->me_handle); @@ -4510,7 +4510,7 @@ bool SixGun::DoNotify(int me, tOSIRISEVTAINOTIFY *notify) { return true; } -short SixGun::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t SixGun::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_AI_INIT: DoInit(data->me_handle); @@ -4545,7 +4545,7 @@ void ExplodeTimeOut::DoInit(int me) { memory->life_left = 160.0f; } -short ExplodeTimeOut::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t ExplodeTimeOut::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_AI_INIT: DoInit(data->me_handle); @@ -5855,7 +5855,7 @@ void GuideBot::DoPowerupCheck(int me) { for (i = 0; i < n_scan; i++) { int type; - short id; + int16_t id; Obj_Value(scan_objs[i], VF_GET, OBJV_I_TYPE, &type); Obj_Value(scan_objs[i], VF_GET, OBJV_US_ID, &id); @@ -6211,7 +6211,7 @@ void GuideBot::DoFrame(int me) { memory->last_anim = anim; } -short GuideBot::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t GuideBot::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_AI_INIT: return (DoInit(data->me_handle, false) != false) ? CONTINUE_CHAIN | CONTINUE_DEFAULT : 0; @@ -6931,7 +6931,7 @@ void Thief::SpewEverything(int me) { void Thief::DoDestroy(int me, tOSIRISEVTDESTROY *evt_destroy) { SpewEverything(me); } -short Thief::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t Thief::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_AI_INIT: DoInit(data->me_handle); @@ -7205,7 +7205,7 @@ bool Sickle::DoNotify(int me_handle, tOSIRISEVTAINOTIFY *notify) { return true; } -short Sickle::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t Sickle::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_AI_INIT: DoInit(data->me_handle); @@ -7298,7 +7298,7 @@ void FireAtDist::DoFrame(int me) { } } -short FireAtDist::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t FireAtDist::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_AI_INIT: DoInit(data->me_handle); @@ -7421,7 +7421,7 @@ void HatePTMC::DoFrame(int me) { } } -short HatePTMC::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t HatePTMC::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_AI_INIT: DoInit(data->me_handle); @@ -7538,7 +7538,7 @@ bool Tubbs::DoNotify(int me, tOSIRISEVTAINOTIFY *notify) { return true; } -short Tubbs::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t Tubbs::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_AI_INIT: DoInit(data->me_handle); @@ -7799,7 +7799,7 @@ bool OldScratch::DoNotify(int me, tOSIRISEVTAINOTIFY *notify) { return true; } -short OldScratch::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t OldScratch::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_AI_INIT: DoInit(data->me_handle); @@ -8291,7 +8291,7 @@ bool BarnSwallow::SetMode(int me, char mode, int it) { return true; } -short BarnSwallow::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t BarnSwallow::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_AI_FRAME: DoFrame(data->me_handle); @@ -8364,7 +8364,7 @@ void GBPowerup::DoFrame(int me) { for (i = 0; i < n_scan; i++) { int type; - short id; + int16_t id; Obj_Value(scan_objs[i], VF_GET, OBJV_I_TYPE, &type); Obj_Value(scan_objs[i], VF_GET, OBJV_US_ID, &id); @@ -8395,7 +8395,7 @@ void GBPowerup::DoFrame(int me) { } } -short GBPowerup::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t GBPowerup::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_INTERVAL: memory->time_till_next_hud_message -= Game_GetFrameTime(); @@ -8608,7 +8608,7 @@ void Sparky::DoFrame(int me) { memory->mode_time += Game_GetFrameTime(); } -short Sparky::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t Sparky::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_AI_INIT: DoInit(data->me_handle); @@ -9120,7 +9120,7 @@ void Hellion::DoFrame(int me) { memory->last_frame = frame; } -short Hellion::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t Hellion::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_AI_INIT: DoInit(data->me_handle); @@ -9572,7 +9572,7 @@ bool MantaRay::DoNotify(int me, tOSIRISEventInfo *data) { return true; } -short MantaRay::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t MantaRay::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_AI_INIT: DoInit(data->me_handle); @@ -9973,7 +9973,7 @@ bool Skiff::DoNotify(int me, tOSIRISEventInfo *data) { return true; } -short Skiff::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t Skiff::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_AI_INIT: DoInit(data->me_handle); @@ -10171,7 +10171,7 @@ void SpyHunter::DoFrame(int me) { memory->mode_time += Game_GetFrameTime(); } -short SpyHunter::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t SpyHunter::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_AI_INIT: DoInit(data->me_handle); @@ -10308,7 +10308,7 @@ void Sniper::DoFrame(int me) { memory->mode_time += Game_GetFrameTime(); } -short Sniper::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t Sniper::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_AI_INIT: DoInit(data->me_handle); @@ -10439,7 +10439,7 @@ void SniperNoRun::DoFrame(int me) { memory->mode_time += Game_GetFrameTime(); } -short SniperNoRun::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t SniperNoRun::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_AI_INIT: DoInit(data->me_handle); @@ -10558,7 +10558,7 @@ void EvaderModA::DoFrame(int me) { memory->mode_time += Game_GetFrameTime(); } -short EvaderModA::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t EvaderModA::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_AI_INIT: DoInit(data->me_handle); @@ -10696,7 +10696,7 @@ void FlameRAS::DoFrame(int me) { memory->mode_time += Game_GetFrameTime(); } -short FlameRAS::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t FlameRAS::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_AI_INIT: DoInit(data->me_handle); @@ -10766,7 +10766,7 @@ void Seeker::DoCollide(int me) { MSafe_CallFunction(MSAFE_OBJECT_REMOVE, &mo); } -short Seeker::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t Seeker::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_AI_INIT: DoInit(data->me_handle); @@ -10828,7 +10828,7 @@ void ObjectRemove(int object) { // Bouncing Betty class //------------------ -short BettyBomb::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t BettyBomb::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_MEMRESTORE: { memory = (tBettyBombInfo *)data->evt_memrestore.memory_ptr; @@ -10932,7 +10932,7 @@ void BettyScript::DoInit(int me) { memory->lasttime = 0; } -short BettyScript::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t BettyScript::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_MEMRESTORE: { memory = (tBettyInfo *)data->evt_memrestore.memory_ptr; @@ -11093,7 +11093,7 @@ void ChaffScript::DoInterval(int handle) { } } -short ChaffScript::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t ChaffScript::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_MEMRESTORE: { memory = (tChaffInfo *)data->evt_memrestore.memory_ptr; @@ -11184,7 +11184,7 @@ void ChaffChunkScript::DoCollide(tOSIRISEventInfo *data) { } } -short ChaffChunkScript::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t ChaffChunkScript::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_MEMRESTORE: { memory = (tChaffChunkInfo *)data->evt_memrestore.memory_ptr; @@ -11234,7 +11234,7 @@ void ProxMine::DoCollide(int me) { MSafe_CallFunction(MSAFE_OBJECT_REMOVE, &mo); } -short ProxMine::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t ProxMine::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_AI_INIT: DoInit(data->me_handle); @@ -11249,7 +11249,7 @@ short ProxMine::CallEvent(int event, tOSIRISEventInfo *data) { //------------------ // Gunboy class //------------------ -short Gunboy::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t Gunboy::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { int parent = GetObjectParent(data->me_handle); diff --git a/scripts/AIGame3.cpp b/scripts/AIGame3.cpp index 62607b88..8863ecbf 100644 --- a/scripts/AIGame3.cpp +++ b/scripts/AIGame3.cpp @@ -39,7 +39,7 @@ DLLEXPORT void STDCALL ShutdownDLL(void); DLLEXPORT int STDCALL GetGOScriptID(const char *name, uint8_t isdoor); DLLEXPORT void STDCALLPTR CreateInstance(int id); DLLEXPORT void STDCALL DestroyInstance(int id, void *ptr); -DLLEXPORT short STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data); +DLLEXPORT int16_t STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data); DLLEXPORT int STDCALL SaveRestoreState(void *file_ptr, uint8_t saving_state); #ifdef __cplusplus } @@ -604,7 +604,7 @@ class BaseObjScript { public: BaseObjScript(); ~BaseObjScript(); - virtual short CallEvent(int event, tOSIRISEventInfo *data); + virtual int16_t CallEvent(int event, tOSIRISEventInfo *data); }; // Priority Constants @@ -867,7 +867,7 @@ private: public: AlienOrganism() {} - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; //--------------------- @@ -1004,7 +1004,7 @@ private: public: HeavyTrooper() {} - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; //--------------------- @@ -1106,7 +1106,7 @@ private: public: Lifter() {} - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; //--------------------- @@ -1332,7 +1332,7 @@ private: public: AlienBoss() {} - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; //--------------------- @@ -1401,7 +1401,7 @@ private: public: SecurityCamera() {} - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; //--------------------- @@ -1441,7 +1441,7 @@ private: public: CrowdControl() {} - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; //----------------------- @@ -1613,7 +1613,7 @@ void STDCALL DestroyInstance(int id, void *ptr) { // the game for that event. This only pertains to certain events. If the chain continues // after this script, than the CONTINUE_DEFAULT setting will be overridden by lower priority // scripts return value. -short STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data) { +int16_t STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data) { return ((BaseObjScript *)ptr)->CallEvent(event, data); } @@ -1636,7 +1636,7 @@ BaseObjScript::BaseObjScript() {} BaseObjScript::~BaseObjScript() {} -short BaseObjScript::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } +int16_t BaseObjScript::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } //--------------------- // AlienOrganism class @@ -2644,7 +2644,7 @@ void AlienOrganism::SetMode(int me, char mode) { // Make sure squad broken flag isn't set memory->squad_flags &= ~ALIEN_BROKEN; - // Calculate destination home point a short distance from actual landing point + // Calculate destination home point a int16_t distance from actual landing point end_pos = memory->home_pos + (memory->home_uvec * 20.0f); flags = FQ_CHECK_OBJS | FQ_IGNORE_POWERUPS | FQ_IGNORE_WEAPONS | FQ_IGNORE_MOVING_OBJECTS | @@ -4063,7 +4063,7 @@ void AlienOrganism::DoCollide(int me, tOSIRISEVTCOLLIDE *collide_data) { } // Receives all basic events and calls processesing functions -short AlienOrganism::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t AlienOrganism::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_AI_INIT: DoInit(data->me_handle); @@ -4696,7 +4696,7 @@ void HeavyTrooper::DoCollide(int me, tOSIRISEVTCOLLIDE *collide_data) { } // Receives all basic events and calls processesing functions -short HeavyTrooper::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t HeavyTrooper::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_AI_INIT: DoInit(data->me_handle); @@ -5366,7 +5366,7 @@ void Lifter::DoCleanUp(int me) { } // Receives all basic events and calls processesing functions -short Lifter::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t Lifter::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_AI_INIT: DoInit(data->me_handle); @@ -5772,7 +5772,7 @@ void AlienBoss::SetMode(int me, char mode) { movement_type = MT_PHYSICS; Obj_Value(me, VF_SET, OBJV_C_MOVEMENT_TYPE, &movement_type); - // Calculate destination home point a short distance from actual landing point + // Calculate destination home point a int16_t distance from actual landing point end_pos = memory->home_pos + (memory->home_uvec * 20.0f); flags = FQ_CHECK_OBJS | FQ_IGNORE_POWERUPS | FQ_IGNORE_WEAPONS | FQ_IGNORE_MOVING_OBJECTS | @@ -6941,7 +6941,7 @@ void AlienBoss::DoCleanUp(int me) { } // Receives all basic events and calls processesing functions -short AlienBoss::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t AlienBoss::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_AI_INIT: DoInit(data->me_handle); @@ -7223,7 +7223,7 @@ bool SecurityCamera::DoNotify(int me, tOSIRISEventInfo *data) { } // Receives all basic events and calls processesing functions -short SecurityCamera::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t SecurityCamera::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_AI_INIT: DoInit(data->me_handle); @@ -7391,7 +7391,7 @@ bool CrowdControl::DoNotify(int me, tOSIRISEventInfo *data) { } // Receives all basic events and calls processesing functions -short CrowdControl::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CrowdControl::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_AI_INIT: DoInit(data->me_handle); diff --git a/scripts/BatteriesIncluded.cpp b/scripts/BatteriesIncluded.cpp index 4a76310c..81200b09 100644 --- a/scripts/BatteriesIncluded.cpp +++ b/scripts/BatteriesIncluded.cpp @@ -40,7 +40,7 @@ DLLEXPORT void STDCALL ShutdownDLL(void); DLLEXPORT int STDCALL GetGOScriptID(const char *name, uint8_t is_door); DLLEXPORT void STDCALLPTR CreateInstance(int id); DLLEXPORT void STDCALL DestroyInstance(int id, void *ptr); -DLLEXPORT short STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data); +DLLEXPORT int16_t STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data); DLLEXPORT int STDCALL GetTriggerScriptID(int trigger_room, int trigger_face); DLLEXPORT int STDCALL GetCOScriptList(int **list, int **id_list); DLLEXPORT int STDCALL SaveRestoreState(void *file_ptr, uint8_t saving_state); @@ -99,197 +99,197 @@ class BaseScript { public: BaseScript(); ~BaseScript(); - virtual short CallEvent(int event, tOSIRISEventInfo *data); + virtual int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class LevelScript_0000 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0000 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0003 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0001 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0002 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0005 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_001C : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_001B : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_001A : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0019 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0018 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0017 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0016 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0015 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0014 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0013 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0012 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0011 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0010 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_000E : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_000D : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_000C : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0025 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0024 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0023 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_000B : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_000A : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0009 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0008 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0007 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0006 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0021 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0020 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_001E : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_001D : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0022 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_001F : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0004 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; // ====================== @@ -1083,7 +1083,7 @@ void STDCALL DestroyInstance(int id, void *ptr) { // =================== // CallInstanceEvent() // =================== -short STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data) { +int16_t STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data) { switch (id) { case ID_LEVEL_0000: case ID_TRIGGER_0000: @@ -1276,12 +1276,12 @@ BaseScript::BaseScript() {} BaseScript::~BaseScript() {} -short BaseScript::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t BaseScript::CallEvent(int event, tOSIRISEventInfo *data) { mprintf(0, "BaseScript::CallEvent()\n"); return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_SAVESTATE: { tOSIRISEVTSAVESTATE *event_data = &data->evt_savestate; @@ -1344,7 +1344,7 @@ short LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -1363,7 +1363,7 @@ short TriggerScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0003::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0003::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -1382,7 +1382,7 @@ short TriggerScript_0003::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0001::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0001::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -1401,7 +1401,7 @@ short TriggerScript_0001::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0002::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0002::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -1420,7 +1420,7 @@ short TriggerScript_0002::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0005::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0005::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -1439,7 +1439,7 @@ short TriggerScript_0005::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_001C::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_001C::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -1458,7 +1458,7 @@ short TriggerScript_001C::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_001B::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_001B::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -1477,7 +1477,7 @@ short TriggerScript_001B::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_001A::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_001A::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -1496,7 +1496,7 @@ short TriggerScript_001A::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0019::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0019::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -1515,7 +1515,7 @@ short TriggerScript_0019::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0018::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0018::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -1534,7 +1534,7 @@ short TriggerScript_0018::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0017::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0017::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -1553,7 +1553,7 @@ short TriggerScript_0017::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0016::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0016::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -1572,7 +1572,7 @@ short TriggerScript_0016::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0015::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0015::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -1591,7 +1591,7 @@ short TriggerScript_0015::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0014::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0014::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -1610,7 +1610,7 @@ short TriggerScript_0014::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0013::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0013::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -1629,7 +1629,7 @@ short TriggerScript_0013::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0012::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0012::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -1648,7 +1648,7 @@ short TriggerScript_0012::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0011::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0011::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -1667,7 +1667,7 @@ short TriggerScript_0011::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0010::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0010::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -1686,7 +1686,7 @@ short TriggerScript_0010::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_000E::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_000E::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -1705,7 +1705,7 @@ short TriggerScript_000E::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_000D::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_000D::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -1724,7 +1724,7 @@ short TriggerScript_000D::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_000C::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_000C::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -1743,7 +1743,7 @@ short TriggerScript_000C::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0025::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0025::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -1762,7 +1762,7 @@ short TriggerScript_0025::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0024::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0024::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -1781,7 +1781,7 @@ short TriggerScript_0024::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0023::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0023::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -1800,7 +1800,7 @@ short TriggerScript_0023::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_000B::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_000B::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -1819,7 +1819,7 @@ short TriggerScript_000B::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_000A::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_000A::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -1838,7 +1838,7 @@ short TriggerScript_000A::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0009::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0009::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -1857,7 +1857,7 @@ short TriggerScript_0009::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0008::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0008::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -1876,7 +1876,7 @@ short TriggerScript_0008::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0007::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0007::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -1895,7 +1895,7 @@ short TriggerScript_0007::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0006::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0006::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -1914,7 +1914,7 @@ short TriggerScript_0006::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0021::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0021::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -1932,7 +1932,7 @@ short TriggerScript_0021::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0020::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0020::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -1950,7 +1950,7 @@ short TriggerScript_0020::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_001E::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_001E::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -1968,7 +1968,7 @@ short TriggerScript_001E::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_001D::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_001D::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -1986,7 +1986,7 @@ short TriggerScript_001D::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0022::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0022::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -2004,7 +2004,7 @@ short TriggerScript_0022::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_001F::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_001F::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -2022,7 +2022,7 @@ short TriggerScript_001F::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0004::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0004::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; diff --git a/scripts/BossCamera.cpp b/scripts/BossCamera.cpp index 852cf5b6..88246259 100644 --- a/scripts/BossCamera.cpp +++ b/scripts/BossCamera.cpp @@ -40,7 +40,7 @@ DLLEXPORT void STDCALL ShutdownDLL(void); DLLEXPORT int STDCALL GetGOScriptID(const char *name, uint8_t is_door); DLLEXPORT void STDCALLPTR CreateInstance(int id); DLLEXPORT void STDCALL DestroyInstance(int id, void *ptr); -DLLEXPORT short STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data); +DLLEXPORT int16_t STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data); DLLEXPORT int STDCALL GetTriggerScriptID(int trigger_room, int trigger_face); DLLEXPORT int STDCALL GetCOScriptList(int **list, int **id_list); DLLEXPORT int STDCALL SaveRestoreState(void *file_ptr, uint8_t saving_state); @@ -63,17 +63,17 @@ class BaseScript { public: BaseScript(); ~BaseScript(); - virtual short CallEvent(int event, tOSIRISEventInfo *data); + virtual int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class LevelScript_0000 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0000 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; // ====================== @@ -470,7 +470,7 @@ void STDCALL DestroyInstance(int id, void *ptr) { // =================== // CallInstanceEvent() // =================== -short STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data) { +int16_t STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data) { switch (id) { case ID_LEVEL_0000: case ID_TRIGGER_0000: @@ -519,12 +519,12 @@ BaseScript::BaseScript() {} BaseScript::~BaseScript() {} -short BaseScript::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t BaseScript::CallEvent(int event, tOSIRISEventInfo *data) { mprintf(0, "BaseScript::CallEvent()\n"); return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_SAVESTATE: { tOSIRISEVTSAVESTATE *event_data = &data->evt_savestate; @@ -548,7 +548,7 @@ short LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; diff --git a/scripts/CanyonsCTF.cpp b/scripts/CanyonsCTF.cpp index 348aa476..11a9bf70 100644 --- a/scripts/CanyonsCTF.cpp +++ b/scripts/CanyonsCTF.cpp @@ -40,7 +40,7 @@ DLLEXPORT void STDCALL ShutdownDLL(void); DLLEXPORT int STDCALL GetGOScriptID(const char *name, uint8_t is_door); DLLEXPORT void STDCALLPTR CreateInstance(int id); DLLEXPORT void STDCALL DestroyInstance(int id, void *ptr); -DLLEXPORT short STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data); +DLLEXPORT int16_t STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data); DLLEXPORT int STDCALL GetTriggerScriptID(int trigger_room, int trigger_face); DLLEXPORT int STDCALL GetCOScriptList(int **list, int **id_list); DLLEXPORT int STDCALL SaveRestoreState(void *file_ptr, uint8_t saving_state); @@ -61,12 +61,12 @@ class BaseScript { public: BaseScript(); ~BaseScript(); - virtual short CallEvent(int event, tOSIRISEventInfo *data); + virtual int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class LevelScript_0000 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; // ====================== @@ -454,7 +454,7 @@ void STDCALL DestroyInstance(int id, void *ptr) { // =================== // CallInstanceEvent() // =================== -short STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data) { +int16_t STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data) { switch (id) { case ID_LEVEL_0000: return ((BaseScript *)ptr)->CallEvent(event, data); @@ -497,12 +497,12 @@ BaseScript::BaseScript() {} BaseScript::~BaseScript() {} -short BaseScript::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t BaseScript::CallEvent(int event, tOSIRISEventInfo *data) { mprintf(0, "BaseScript::CallEvent()\n"); return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_SAVESTATE: { tOSIRISEVTSAVESTATE *event_data = &data->evt_savestate; diff --git a/scripts/CellTestLevel.cpp b/scripts/CellTestLevel.cpp index 51ea4530..e900b4ae 100644 --- a/scripts/CellTestLevel.cpp +++ b/scripts/CellTestLevel.cpp @@ -40,7 +40,7 @@ DLLEXPORT void STDCALL ShutdownDLL(void); DLLEXPORT int STDCALL GetGOScriptID(const char *name, uint8_t is_door); DLLEXPORT void STDCALLPTR CreateInstance(int id); DLLEXPORT void STDCALL DestroyInstance(int id, void *ptr); -DLLEXPORT short STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data); +DLLEXPORT int16_t STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data); DLLEXPORT int STDCALL GetTriggerScriptID(int trigger_room, int trigger_face); DLLEXPORT int STDCALL GetCOScriptList(int **list, int **id_list); DLLEXPORT int STDCALL SaveRestoreState(void *file_ptr, uint8_t saving_state); @@ -61,12 +61,12 @@ class BaseScript { public: BaseScript(); ~BaseScript(); - virtual short CallEvent(int event, tOSIRISEventInfo *data); + virtual int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class LevelScript_0000 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; // ====================== @@ -456,7 +456,7 @@ void STDCALL DestroyInstance(int id, void *ptr) { // =================== // CallInstanceEvent() // =================== -short STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data) { +int16_t STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data) { switch (id) { case ID_LEVEL_0000: return ((BaseScript *)ptr)->CallEvent(event, data); @@ -499,12 +499,12 @@ BaseScript::BaseScript() {} BaseScript::~BaseScript() {} -short BaseScript::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t BaseScript::CallEvent(int event, tOSIRISEventInfo *data) { mprintf(0, "BaseScript::CallEvent()\n"); return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_SAVESTATE: { tOSIRISEVTSAVESTATE *event_data = &data->evt_savestate; diff --git a/scripts/ChrisTest.cpp b/scripts/ChrisTest.cpp index 8b64217f..63a65351 100644 --- a/scripts/ChrisTest.cpp +++ b/scripts/ChrisTest.cpp @@ -40,7 +40,7 @@ DLLEXPORT void STDCALL ShutdownDLL(void); DLLEXPORT int STDCALL GetGOScriptID(const char *name, uint8_t is_door); DLLEXPORT void STDCALLPTR CreateInstance(int id); DLLEXPORT void STDCALL DestroyInstance(int id, void *ptr); -DLLEXPORT short STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data); +DLLEXPORT int16_t STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data); DLLEXPORT int STDCALL GetTriggerScriptID(int trigger_room, int trigger_face); DLLEXPORT int STDCALL GetCOScriptList(int **list, int **id_list); DLLEXPORT int STDCALL SaveRestoreState(void *file_ptr, uint8_t saving_state); @@ -63,17 +63,17 @@ class BaseScript { public: BaseScript(); ~BaseScript(); - virtual short CallEvent(int event, tOSIRISEventInfo *data); + virtual int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class LevelScript_0000 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_1004 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; // ====================== @@ -488,7 +488,7 @@ void STDCALL DestroyInstance(int id, void *ptr) { // =================== // CallInstanceEvent() // =================== -short STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data) { +int16_t STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data) { switch (id) { case ID_LEVEL_0000: case ID_CUSTOM_OBJECT_1004: @@ -535,12 +535,12 @@ BaseScript::BaseScript() {} BaseScript::~BaseScript() {} -short BaseScript::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t BaseScript::CallEvent(int event, tOSIRISEventInfo *data) { mprintf(0, "BaseScript::CallEvent()\n"); return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_SAVESTATE: { tOSIRISEVTSAVESTATE *event_data = &data->evt_savestate; @@ -601,7 +601,7 @@ short LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_1004::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_1004::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { tOSIRISEVTCREATED *event_data = &data->evt_created; diff --git a/scripts/Geodomes.cpp b/scripts/Geodomes.cpp index 0a12a8d7..7957306e 100644 --- a/scripts/Geodomes.cpp +++ b/scripts/Geodomes.cpp @@ -40,7 +40,7 @@ DLLEXPORT void STDCALL ShutdownDLL(void); DLLEXPORT int STDCALL GetGOScriptID(const char *name, uint8_t is_door); DLLEXPORT void STDCALLPTR CreateInstance(int id); DLLEXPORT void STDCALL DestroyInstance(int id, void *ptr); -DLLEXPORT short STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data); +DLLEXPORT int16_t STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data); DLLEXPORT int STDCALL GetTriggerScriptID(int trigger_room, int trigger_face); DLLEXPORT int STDCALL GetCOScriptList(int **list, int **id_list); DLLEXPORT int STDCALL SaveRestoreState(void *file_ptr, uint8_t saving_state); @@ -66,32 +66,32 @@ class BaseScript { public: BaseScript(); ~BaseScript(); - virtual short CallEvent(int event, tOSIRISEventInfo *data); + virtual int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class LevelScript_0000 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_1081 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_1080 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_107A : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_107B : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; // ====================== @@ -532,7 +532,7 @@ void STDCALL DestroyInstance(int id, void *ptr) { // =================== // CallInstanceEvent() // =================== -short STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data) { +int16_t STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data) { switch (id) { case ID_LEVEL_0000: case ID_CUSTOM_OBJECT_1081: @@ -586,12 +586,12 @@ BaseScript::BaseScript() {} BaseScript::~BaseScript() {} -short BaseScript::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t BaseScript::CallEvent(int event, tOSIRISEventInfo *data) { mprintf(0, "BaseScript::CallEvent()\n"); return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_SAVESTATE: { tOSIRISEVTSAVESTATE *event_data = &data->evt_savestate; @@ -636,7 +636,7 @@ short LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_1081::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_1081::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -654,7 +654,7 @@ short CustomObjectScript_1081::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_1080::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_1080::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -672,7 +672,7 @@ short CustomObjectScript_1080::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_107A::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_107A::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -690,7 +690,7 @@ short CustomObjectScript_107A::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_107B::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_107B::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; diff --git a/scripts/HalfPipe.cpp b/scripts/HalfPipe.cpp index 5c751d82..0cbc6376 100644 --- a/scripts/HalfPipe.cpp +++ b/scripts/HalfPipe.cpp @@ -40,7 +40,7 @@ DLLEXPORT void STDCALL ShutdownDLL(void); DLLEXPORT int STDCALL GetGOScriptID(const char *name, uint8_t is_door); DLLEXPORT void STDCALLPTR CreateInstance(int id); DLLEXPORT void STDCALL DestroyInstance(int id, void *ptr); -DLLEXPORT short STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data); +DLLEXPORT int16_t STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data); DLLEXPORT int STDCALL GetTriggerScriptID(int trigger_room, int trigger_face); DLLEXPORT int STDCALL GetCOScriptList(int **list, int **id_list); DLLEXPORT int STDCALL SaveRestoreState(void *file_ptr, uint8_t saving_state); @@ -66,32 +66,32 @@ class BaseScript { public: BaseScript(); ~BaseScript(); - virtual short CallEvent(int event, tOSIRISEventInfo *data); + virtual int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class LevelScript_0000 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0003 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0002 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0001 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0000 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; // ====================== @@ -528,7 +528,7 @@ void STDCALL DestroyInstance(int id, void *ptr) { // =================== // CallInstanceEvent() // =================== -short STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data) { +int16_t STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data) { switch (id) { case ID_LEVEL_0000: case ID_TRIGGER_0003: @@ -589,12 +589,12 @@ BaseScript::BaseScript() {} BaseScript::~BaseScript() {} -short BaseScript::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t BaseScript::CallEvent(int event, tOSIRISEventInfo *data) { mprintf(0, "BaseScript::CallEvent()\n"); return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_SAVESTATE: { tOSIRISEVTSAVESTATE *event_data = &data->evt_savestate; @@ -630,7 +630,7 @@ short LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0003::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0003::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -649,7 +649,7 @@ short TriggerScript_0003::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0002::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0002::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -668,7 +668,7 @@ short TriggerScript_0002::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0001::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0001::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -687,7 +687,7 @@ short TriggerScript_0001::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; diff --git a/scripts/InfernalBolt.cpp b/scripts/InfernalBolt.cpp index 66581996..90447b1e 100644 --- a/scripts/InfernalBolt.cpp +++ b/scripts/InfernalBolt.cpp @@ -40,7 +40,7 @@ DLLEXPORT void STDCALL ShutdownDLL(void); DLLEXPORT int STDCALL GetGOScriptID(const char *name, uint8_t is_door); DLLEXPORT void STDCALLPTR CreateInstance(int id); DLLEXPORT void STDCALL DestroyInstance(int id, void *ptr); -DLLEXPORT short STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data); +DLLEXPORT int16_t STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data); DLLEXPORT int STDCALL GetTriggerScriptID(int trigger_room, int trigger_face); DLLEXPORT int STDCALL GetCOScriptList(int **list, int **id_list); DLLEXPORT int STDCALL SaveRestoreState(void *file_ptr, uint8_t saving_state); @@ -64,22 +64,22 @@ class BaseScript { public: BaseScript(); ~BaseScript(); - virtual short CallEvent(int event, tOSIRISEventInfo *data); + virtual int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class LevelScript_0000 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0803 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_101E : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; // ====================== @@ -526,7 +526,7 @@ void STDCALL DestroyInstance(int id, void *ptr) { // =================== // CallInstanceEvent() // =================== -short STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data) { +int16_t STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data) { switch (id) { case ID_LEVEL_0000: case ID_CUSTOM_OBJECT_0803: @@ -575,12 +575,12 @@ BaseScript::BaseScript() {} BaseScript::~BaseScript() {} -short BaseScript::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t BaseScript::CallEvent(int event, tOSIRISEventInfo *data) { mprintf(0, "BaseScript::CallEvent()\n"); return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_SAVESTATE: { tOSIRISEVTSAVESTATE *event_data = &data->evt_savestate; @@ -623,7 +623,7 @@ short LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0803::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0803::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -702,7 +702,7 @@ short CustomObjectScript_0803::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_101E::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_101E::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; diff --git a/scripts/Inversion.cpp b/scripts/Inversion.cpp index 982d89cd..a59a78ae 100644 --- a/scripts/Inversion.cpp +++ b/scripts/Inversion.cpp @@ -40,7 +40,7 @@ DLLEXPORT void STDCALL ShutdownDLL(void); DLLEXPORT int STDCALL GetGOScriptID(const char *name, uint8_t is_door); DLLEXPORT void STDCALLPTR CreateInstance(int id); DLLEXPORT void STDCALL DestroyInstance(int id, void *ptr); -DLLEXPORT short STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data); +DLLEXPORT int16_t STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data); DLLEXPORT int STDCALL GetTriggerScriptID(int trigger_room, int trigger_face); DLLEXPORT int STDCALL GetCOScriptList(int **list, int **id_list); DLLEXPORT int STDCALL SaveRestoreState(void *file_ptr, uint8_t saving_state); @@ -83,112 +83,112 @@ class BaseScript { public: BaseScript(); ~BaseScript(); - virtual short CallEvent(int event, tOSIRISEventInfo *data); + virtual int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class LevelScript_0000 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0810 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0811 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0812 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0813 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0876 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0875 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0859 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_085A : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0009 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0008 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0007 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0006 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0003 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0002 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0001 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0000 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_000B : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_000A : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0005 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0004 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; // ====================== @@ -868,7 +868,7 @@ void STDCALL DestroyInstance(int id, void *ptr) { // =================== // CallInstanceEvent() // =================== -short STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data) { +int16_t STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data) { switch (id) { case ID_LEVEL_0000: case ID_CUSTOM_OBJECT_0810: @@ -981,12 +981,12 @@ BaseScript::BaseScript() {} BaseScript::~BaseScript() {} -short BaseScript::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t BaseScript::CallEvent(int event, tOSIRISEventInfo *data) { mprintf(0, "BaseScript::CallEvent()\n"); return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_SAVESTATE: { tOSIRISEVTSAVESTATE *event_data = &data->evt_savestate; @@ -1090,7 +1090,7 @@ short LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0810::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0810::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -1141,7 +1141,7 @@ short CustomObjectScript_0810::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0811::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0811::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -1192,7 +1192,7 @@ short CustomObjectScript_0811::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0812::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0812::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -1243,7 +1243,7 @@ short CustomObjectScript_0812::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0813::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0813::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -1294,7 +1294,7 @@ short CustomObjectScript_0813::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0876::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0876::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -1345,7 +1345,7 @@ short CustomObjectScript_0876::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0875::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0875::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -1396,7 +1396,7 @@ short CustomObjectScript_0875::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0859::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0859::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -1447,7 +1447,7 @@ short CustomObjectScript_0859::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_085A::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_085A::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -1498,7 +1498,7 @@ short CustomObjectScript_085A::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0009::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0009::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -1517,7 +1517,7 @@ short TriggerScript_0009::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0008::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0008::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -1536,7 +1536,7 @@ short TriggerScript_0008::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0007::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0007::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -1555,7 +1555,7 @@ short TriggerScript_0007::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0006::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0006::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -1574,7 +1574,7 @@ short TriggerScript_0006::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0003::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0003::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -1593,7 +1593,7 @@ short TriggerScript_0003::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0002::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0002::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -1612,7 +1612,7 @@ short TriggerScript_0002::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0001::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0001::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -1631,7 +1631,7 @@ short TriggerScript_0001::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -1650,7 +1650,7 @@ short TriggerScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_000B::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_000B::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -1670,7 +1670,7 @@ short TriggerScript_000B::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_000A::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_000A::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -1690,7 +1690,7 @@ short TriggerScript_000A::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0005::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0005::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -1710,7 +1710,7 @@ short TriggerScript_0005::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0004::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0004::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; diff --git a/scripts/LEVEL0.cpp b/scripts/LEVEL0.cpp index 81e7a2c3..e4a57679 100644 --- a/scripts/LEVEL0.cpp +++ b/scripts/LEVEL0.cpp @@ -40,7 +40,7 @@ DLLEXPORT void STDCALL ShutdownDLL(void); DLLEXPORT int STDCALL GetGOScriptID(const char *name, uint8_t is_door); DLLEXPORT void STDCALLPTR CreateInstance(int id); DLLEXPORT void STDCALL DestroyInstance(int id, void *ptr); -DLLEXPORT short STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data); +DLLEXPORT int16_t STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data); DLLEXPORT int STDCALL GetTriggerScriptID(int trigger_room, int trigger_face); DLLEXPORT int STDCALL GetCOScriptList(int **list, int **id_list); DLLEXPORT int STDCALL SaveRestoreState(void *file_ptr, uint8_t saving_state); @@ -85,122 +85,122 @@ class BaseScript { public: BaseScript(); ~BaseScript(); - virtual short CallEvent(int event, tOSIRISEventInfo *data); + virtual int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class LevelScript_0000 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_3855 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_10DC : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_10E0 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_10DF : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_08E8 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_584D : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0816 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_301B : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_18DB : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_000C : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0000 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0001 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0002 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0003 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0004 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0006 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0005 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_000A : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_000B : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0008 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0007 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0009 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; // ====================== @@ -886,7 +886,7 @@ void STDCALL DestroyInstance(int id, void *ptr) { // =================== // CallInstanceEvent() // =================== -short STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data) { +int16_t STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data) { switch (id) { case ID_LEVEL_0000: case ID_CUSTOM_OBJECT_3855: @@ -1005,12 +1005,12 @@ BaseScript::BaseScript() {} BaseScript::~BaseScript() {} -short BaseScript::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t BaseScript::CallEvent(int event, tOSIRISEventInfo *data) { mprintf(0, "BaseScript::CallEvent()\n"); return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_SAVESTATE: { tOSIRISEVTSAVESTATE *event_data = &data->evt_savestate; @@ -1222,7 +1222,7 @@ short LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_3855::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_3855::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -1247,7 +1247,7 @@ short CustomObjectScript_3855::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_10DC::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_10DC::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -1266,7 +1266,7 @@ short CustomObjectScript_10DC::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_10E0::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_10E0::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -1292,7 +1292,7 @@ short CustomObjectScript_10E0::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_10DF::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_10DF::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -1318,7 +1318,7 @@ short CustomObjectScript_10DF::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_08E8::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_08E8::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -1348,7 +1348,7 @@ short CustomObjectScript_08E8::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_584D::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_584D::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -1369,7 +1369,7 @@ short CustomObjectScript_584D::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0816::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0816::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -1389,7 +1389,7 @@ short CustomObjectScript_0816::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_301B::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_301B::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -1423,7 +1423,7 @@ short CustomObjectScript_301B::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_18DB::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_18DB::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -1457,7 +1457,7 @@ short CustomObjectScript_18DB::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_000C::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_000C::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -1478,7 +1478,7 @@ short TriggerScript_000C::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -1497,7 +1497,7 @@ short TriggerScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0001::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0001::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -1515,7 +1515,7 @@ short TriggerScript_0001::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0002::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0002::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -1542,7 +1542,7 @@ short TriggerScript_0002::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0003::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0003::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -1560,7 +1560,7 @@ short TriggerScript_0003::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0004::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0004::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -1578,7 +1578,7 @@ short TriggerScript_0004::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0006::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0006::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -1596,7 +1596,7 @@ short TriggerScript_0006::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0005::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0005::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -1614,7 +1614,7 @@ short TriggerScript_0005::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_000A::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_000A::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -1632,7 +1632,7 @@ short TriggerScript_000A::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_000B::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_000B::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -1650,7 +1650,7 @@ short TriggerScript_000B::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0008::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0008::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -1668,7 +1668,7 @@ short TriggerScript_0008::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0007::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0007::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -1686,7 +1686,7 @@ short TriggerScript_0007::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0009::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0009::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; diff --git a/scripts/LEVEL15.cpp b/scripts/LEVEL15.cpp index b0f981d8..e3b67eca 100644 --- a/scripts/LEVEL15.cpp +++ b/scripts/LEVEL15.cpp @@ -40,7 +40,7 @@ DLLEXPORT void STDCALL ShutdownDLL(void); DLLEXPORT int STDCALL GetGOScriptID(const char *name, uint8_t is_door); DLLEXPORT void STDCALLPTR CreateInstance(int id); DLLEXPORT void STDCALL DestroyInstance(int id, void *ptr); -DLLEXPORT short STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data); +DLLEXPORT int16_t STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data); DLLEXPORT int STDCALL GetTriggerScriptID(int trigger_room, int trigger_face); DLLEXPORT int STDCALL GetCOScriptList(int **list, int **id_list); DLLEXPORT int STDCALL SaveRestoreState(void *file_ptr, uint8_t saving_state); @@ -119,292 +119,292 @@ class BaseScript { public: BaseScript(); ~BaseScript(); - virtual short CallEvent(int event, tOSIRISEventInfo *data); + virtual int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class LevelScript_0000 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_10FD : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_084D : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_084E : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_084F : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_084C : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_1913 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0851 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0850 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0852 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0858 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0857 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0856 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0855 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_399D : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_210D : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_210E : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_190F : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_2801 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_1828 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_1015 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0848 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0849 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0847 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_3831 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_2111 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0AB1 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0000 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0001 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0002 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0005 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0004 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0003 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0008 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0007 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0006 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0009 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_000B : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0020 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_001E : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_001C : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_001A : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0017 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_001B : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0018 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0015 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0013 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0011 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0010 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_001F : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_001D : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0016 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0014 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0012 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0019 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_000F : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_000A : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; // ====================== @@ -2209,7 +2209,7 @@ void STDCALL DestroyInstance(int id, void *ptr) { // =================== // CallInstanceEvent() // =================== -short STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data) { +int16_t STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data) { switch (id) { case ID_LEVEL_0000: case ID_CUSTOM_OBJECT_10FD: @@ -2434,12 +2434,12 @@ BaseScript::BaseScript() {} BaseScript::~BaseScript() {} -short BaseScript::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t BaseScript::CallEvent(int event, tOSIRISEventInfo *data) { mprintf(0, "BaseScript::CallEvent()\n"); return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_SAVESTATE: { tOSIRISEVTSAVESTATE *event_data = &data->evt_savestate; @@ -2711,7 +2711,7 @@ short LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_10FD::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_10FD::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -2732,7 +2732,7 @@ short CustomObjectScript_10FD::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_084D::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_084D::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -2754,7 +2754,7 @@ short CustomObjectScript_084D::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_084E::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_084E::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -2776,7 +2776,7 @@ short CustomObjectScript_084E::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_084F::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_084F::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -2798,7 +2798,7 @@ short CustomObjectScript_084F::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_084C::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_084C::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -2844,7 +2844,7 @@ short CustomObjectScript_084C::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_1913::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_1913::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -2865,7 +2865,7 @@ short CustomObjectScript_1913::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0851::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0851::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -2883,7 +2883,7 @@ short CustomObjectScript_0851::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0850::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0850::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -2901,7 +2901,7 @@ short CustomObjectScript_0850::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0852::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0852::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -2919,7 +2919,7 @@ short CustomObjectScript_0852::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0858::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0858::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -2937,7 +2937,7 @@ short CustomObjectScript_0858::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0857::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0857::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -2955,7 +2955,7 @@ short CustomObjectScript_0857::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0856::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0856::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -2973,7 +2973,7 @@ short CustomObjectScript_0856::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0855::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0855::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -2991,7 +2991,7 @@ short CustomObjectScript_0855::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_399D::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_399D::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3009,7 +3009,7 @@ short CustomObjectScript_399D::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_210D::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_210D::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3035,7 +3035,7 @@ short CustomObjectScript_210D::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_210E::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_210E::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3061,7 +3061,7 @@ short CustomObjectScript_210E::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_190F::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_190F::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3087,7 +3087,7 @@ short CustomObjectScript_190F::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_2801::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_2801::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3110,7 +3110,7 @@ short CustomObjectScript_2801::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_1828::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_1828::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3133,7 +3133,7 @@ short CustomObjectScript_1828::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_1015::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_1015::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3156,7 +3156,7 @@ short CustomObjectScript_1015::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0848::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0848::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3195,7 +3195,7 @@ short CustomObjectScript_0848::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0849::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0849::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3234,7 +3234,7 @@ short CustomObjectScript_0849::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0847::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0847::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3262,7 +3262,7 @@ short CustomObjectScript_0847::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_3831::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_3831::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3296,7 +3296,7 @@ short CustomObjectScript_3831::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_2111::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_2111::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_DESTROY: { tOSIRISEVTDESTROY *event_data = &data->evt_destroy; @@ -3320,7 +3320,7 @@ short CustomObjectScript_2111::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0AB1::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0AB1::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3354,7 +3354,7 @@ short CustomObjectScript_0AB1::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3372,7 +3372,7 @@ short TriggerScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0001::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0001::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3391,7 +3391,7 @@ short TriggerScript_0001::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0002::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0002::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3410,7 +3410,7 @@ short TriggerScript_0002::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0005::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0005::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3429,7 +3429,7 @@ short TriggerScript_0005::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0004::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0004::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3448,7 +3448,7 @@ short TriggerScript_0004::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0003::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0003::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3467,7 +3467,7 @@ short TriggerScript_0003::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0008::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0008::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3488,7 +3488,7 @@ short TriggerScript_0008::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0007::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0007::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3509,7 +3509,7 @@ short TriggerScript_0007::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0006::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0006::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3530,7 +3530,7 @@ short TriggerScript_0006::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0009::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0009::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3549,7 +3549,7 @@ short TriggerScript_0009::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_000B::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_000B::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3567,7 +3567,7 @@ short TriggerScript_000B::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0020::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0020::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3585,7 +3585,7 @@ short TriggerScript_0020::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_001E::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_001E::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3603,7 +3603,7 @@ short TriggerScript_001E::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_001C::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_001C::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3621,7 +3621,7 @@ short TriggerScript_001C::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_001A::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_001A::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3639,7 +3639,7 @@ short TriggerScript_001A::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0017::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0017::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3657,7 +3657,7 @@ short TriggerScript_0017::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_001B::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_001B::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3675,7 +3675,7 @@ short TriggerScript_001B::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0018::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0018::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3693,7 +3693,7 @@ short TriggerScript_0018::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0015::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0015::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3711,7 +3711,7 @@ short TriggerScript_0015::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0013::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0013::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3729,7 +3729,7 @@ short TriggerScript_0013::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0011::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0011::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3747,7 +3747,7 @@ short TriggerScript_0011::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0010::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0010::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3765,7 +3765,7 @@ short TriggerScript_0010::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_001F::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_001F::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3783,7 +3783,7 @@ short TriggerScript_001F::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_001D::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_001D::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3801,7 +3801,7 @@ short TriggerScript_001D::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0016::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0016::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3819,7 +3819,7 @@ short TriggerScript_0016::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0014::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0014::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3837,7 +3837,7 @@ short TriggerScript_0014::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0012::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0012::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3855,7 +3855,7 @@ short TriggerScript_0012::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0019::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0019::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3873,7 +3873,7 @@ short TriggerScript_0019::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_000F::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_000F::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3891,7 +3891,7 @@ short TriggerScript_000F::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_000A::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_000A::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; diff --git a/scripts/Level12.cpp b/scripts/Level12.cpp index 2817bdcf..bd9dcf29 100644 --- a/scripts/Level12.cpp +++ b/scripts/Level12.cpp @@ -40,7 +40,7 @@ DLLEXPORT void STDCALL ShutdownDLL(void); DLLEXPORT int STDCALL GetGOScriptID(const char *name, uint8_t is_door); DLLEXPORT void STDCALLPTR CreateInstance(int id); DLLEXPORT void STDCALL DestroyInstance(int id, void *ptr); -DLLEXPORT short STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data); +DLLEXPORT int16_t STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data); DLLEXPORT int STDCALL GetTriggerScriptID(int trigger_room, int trigger_face); DLLEXPORT int STDCALL GetCOScriptList(int **list, int **id_list); DLLEXPORT int STDCALL SaveRestoreState(void *file_ptr, uint8_t saving_state); @@ -176,577 +176,577 @@ class BaseScript { public: BaseScript(); ~BaseScript(); - virtual short CallEvent(int event, tOSIRISEventInfo *data); + virtual int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class LevelScript_0000 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_09DF : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_09DD : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_09DC : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_09DE : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_09DB : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_1090 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_1173 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_087C : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_087B : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_087A : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0879 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0878 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_204D : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0880 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_1077 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_1871 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_08AF : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_08B0 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_08B1 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_107D : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_117F : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_1180 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_1168 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_1081 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_08B5 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_08FD : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0949 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0846 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0954 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0955 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0956 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0957 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_08C2 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_18C3 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0952 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0953 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0950 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0951 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_104E : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_1969 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_216B : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_096C : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_096E : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_096D : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0977 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_08E2 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_097C : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_097B : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_097A : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_08E9 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_08E8 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_105A : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_097D : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_1801 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_103C : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0984 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_098C : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0992 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_20BC : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_09C6 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_09C7 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_09C8 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_11C5 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_11C4 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_21BC : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_11B5 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_2886 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_11B4 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_1885 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_28BB : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_186E : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_18F0 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_19BE : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_18F1 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_19C0 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_18EE : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_20CD : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_28CC : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_10B2 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_18C1 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_21B8 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_21B9 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_080A : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_080C : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0811 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0012 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0013 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0007 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0005 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0003 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0008 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_001E : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_001F : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0001 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_000B : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_000A : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_000C : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_000D : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0021 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0020 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0000 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_001A : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0019 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_000E : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_001B : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0018 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0017 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0016 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0015 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_001D : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_001C : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_000F : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0010 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; // ====================== @@ -2774,7 +2774,7 @@ void STDCALL DestroyInstance(int id, void *ptr) { // =================== // CallInstanceEvent() // =================== -short STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data) { +int16_t STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data) { switch (id) { case ID_LEVEL_0000: case ID_CUSTOM_OBJECT_09DF: @@ -3125,12 +3125,12 @@ BaseScript::BaseScript() {} BaseScript::~BaseScript() {} -short BaseScript::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t BaseScript::CallEvent(int event, tOSIRISEventInfo *data) { mprintf(0, "BaseScript::CallEvent()\n"); return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_SAVESTATE: { tOSIRISEVTSAVESTATE *event_data = &data->evt_savestate; @@ -3394,7 +3394,7 @@ short LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_09DF::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_09DF::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -3426,7 +3426,7 @@ short CustomObjectScript_09DF::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_09DD::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_09DD::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -3458,7 +3458,7 @@ short CustomObjectScript_09DD::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_09DC::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_09DC::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -3490,7 +3490,7 @@ short CustomObjectScript_09DC::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_09DE::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_09DE::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -3522,7 +3522,7 @@ short CustomObjectScript_09DE::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_09DB::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_09DB::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_DESTROY: { tOSIRISEVTDESTROY *event_data = &data->evt_destroy; @@ -3592,7 +3592,7 @@ short CustomObjectScript_09DB::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_1090::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_1090::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_DESTROY: { tOSIRISEVTDESTROY *event_data = &data->evt_destroy; @@ -3624,7 +3624,7 @@ short CustomObjectScript_1090::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_1173::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_1173::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_DESTROY: { tOSIRISEVTDESTROY *event_data = &data->evt_destroy; @@ -3656,7 +3656,7 @@ short CustomObjectScript_1173::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_087C::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_087C::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3677,7 +3677,7 @@ short CustomObjectScript_087C::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_087B::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_087B::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3698,7 +3698,7 @@ short CustomObjectScript_087B::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_087A::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_087A::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3719,7 +3719,7 @@ short CustomObjectScript_087A::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0879::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0879::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3740,7 +3740,7 @@ short CustomObjectScript_0879::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0878::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0878::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3761,7 +3761,7 @@ short CustomObjectScript_0878::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_204D::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_204D::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3782,7 +3782,7 @@ short CustomObjectScript_204D::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0880::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0880::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3807,7 +3807,7 @@ short CustomObjectScript_0880::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_1077::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_1077::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -3828,7 +3828,7 @@ short CustomObjectScript_1077::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_1871::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_1871::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -3849,7 +3849,7 @@ short CustomObjectScript_1871::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_08AF::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_08AF::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { tOSIRISEVTCREATED *event_data = &data->evt_created; @@ -3889,7 +3889,7 @@ short CustomObjectScript_08AF::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_08B0::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_08B0::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { tOSIRISEVTCREATED *event_data = &data->evt_created; @@ -3929,7 +3929,7 @@ short CustomObjectScript_08B0::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_08B1::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_08B1::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { tOSIRISEVTCREATED *event_data = &data->evt_created; @@ -3969,7 +3969,7 @@ short CustomObjectScript_08B1::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_107D::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_107D::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_DESTROY: { tOSIRISEVTDESTROY *event_data = &data->evt_destroy; @@ -4015,7 +4015,7 @@ short CustomObjectScript_107D::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_117F::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_117F::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_DESTROY: { tOSIRISEVTDESTROY *event_data = &data->evt_destroy; @@ -4061,7 +4061,7 @@ short CustomObjectScript_117F::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_1180::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_1180::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_DESTROY: { tOSIRISEVTDESTROY *event_data = &data->evt_destroy; @@ -4102,7 +4102,7 @@ short CustomObjectScript_1180::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_1168::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_1168::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_DESTROY: { tOSIRISEVTDESTROY *event_data = &data->evt_destroy; @@ -4143,7 +4143,7 @@ short CustomObjectScript_1168::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_1081::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_1081::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { tOSIRISEVTCREATED *event_data = &data->evt_created; @@ -4232,7 +4232,7 @@ short CustomObjectScript_1081::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_08B5::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_08B5::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -4253,7 +4253,7 @@ short CustomObjectScript_08B5::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_08FD::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_08FD::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { tOSIRISEVTCREATED *event_data = &data->evt_created; @@ -4286,7 +4286,7 @@ short CustomObjectScript_08FD::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0949::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0949::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { tOSIRISEVTCREATED *event_data = &data->evt_created; @@ -4311,7 +4311,7 @@ short CustomObjectScript_0949::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0846::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0846::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { tOSIRISEVTCREATED *event_data = &data->evt_created; @@ -4342,7 +4342,7 @@ short CustomObjectScript_0846::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0954::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0954::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -4362,7 +4362,7 @@ short CustomObjectScript_0954::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0955::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0955::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -4382,7 +4382,7 @@ short CustomObjectScript_0955::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0956::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0956::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -4402,7 +4402,7 @@ short CustomObjectScript_0956::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0957::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0957::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -4422,7 +4422,7 @@ short CustomObjectScript_0957::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_08C2::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_08C2::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -4481,7 +4481,7 @@ short CustomObjectScript_08C2::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_18C3::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_18C3::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -4540,7 +4540,7 @@ short CustomObjectScript_18C3::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0952::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0952::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -4568,7 +4568,7 @@ short CustomObjectScript_0952::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0953::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0953::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -4596,7 +4596,7 @@ short CustomObjectScript_0953::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0950::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0950::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -4624,7 +4624,7 @@ short CustomObjectScript_0950::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0951::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0951::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -4652,7 +4652,7 @@ short CustomObjectScript_0951::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_104E::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_104E::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -4698,7 +4698,7 @@ short CustomObjectScript_104E::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_1969::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_1969::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -4757,7 +4757,7 @@ short CustomObjectScript_1969::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_216B::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_216B::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { tOSIRISEVTCREATED *event_data = &data->evt_created; @@ -4800,7 +4800,7 @@ short CustomObjectScript_216B::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_096C::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_096C::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_DESTROY: { tOSIRISEVTDESTROY *event_data = &data->evt_destroy; @@ -4824,7 +4824,7 @@ short CustomObjectScript_096C::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_096E::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_096E::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_DESTROY: { tOSIRISEVTDESTROY *event_data = &data->evt_destroy; @@ -4848,7 +4848,7 @@ short CustomObjectScript_096E::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_096D::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_096D::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_DESTROY: { tOSIRISEVTDESTROY *event_data = &data->evt_destroy; @@ -4872,7 +4872,7 @@ short CustomObjectScript_096D::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0977::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0977::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { tOSIRISEVTCREATED *event_data = &data->evt_created; @@ -4912,7 +4912,7 @@ short CustomObjectScript_0977::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_08E2::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_08E2::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -4935,7 +4935,7 @@ short CustomObjectScript_08E2::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_097C::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_097C::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -4970,7 +4970,7 @@ short CustomObjectScript_097C::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_097B::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_097B::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5005,7 +5005,7 @@ short CustomObjectScript_097B::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_097A::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_097A::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5040,7 +5040,7 @@ short CustomObjectScript_097A::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_08E9::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_08E9::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5107,7 +5107,7 @@ short CustomObjectScript_08E9::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_08E8::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_08E8::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5155,7 +5155,7 @@ short CustomObjectScript_08E8::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_105A::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_105A::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5195,7 +5195,7 @@ short CustomObjectScript_105A::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_097D::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_097D::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5235,7 +5235,7 @@ short CustomObjectScript_097D::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_1801::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_1801::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_DESTROY: { tOSIRISEVTDESTROY *event_data = &data->evt_destroy; @@ -5277,7 +5277,7 @@ short CustomObjectScript_1801::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_103C::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_103C::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -5310,7 +5310,7 @@ short CustomObjectScript_103C::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0984::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0984::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -5355,7 +5355,7 @@ short CustomObjectScript_0984::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_098C::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_098C::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -5384,7 +5384,7 @@ short CustomObjectScript_098C::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0992::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0992::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -5407,7 +5407,7 @@ short CustomObjectScript_0992::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_20BC::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_20BC::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5459,7 +5459,7 @@ short CustomObjectScript_20BC::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_09C6::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_09C6::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5477,7 +5477,7 @@ short CustomObjectScript_09C6::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_09C7::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_09C7::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5495,7 +5495,7 @@ short CustomObjectScript_09C7::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_09C8::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_09C8::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5513,7 +5513,7 @@ short CustomObjectScript_09C8::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_11C5::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_11C5::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5531,7 +5531,7 @@ short CustomObjectScript_11C5::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_11C4::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_11C4::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5549,7 +5549,7 @@ short CustomObjectScript_11C4::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_21BC::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_21BC::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5567,7 +5567,7 @@ short CustomObjectScript_21BC::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_11B5::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_11B5::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5585,7 +5585,7 @@ short CustomObjectScript_11B5::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_2886::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_2886::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5603,7 +5603,7 @@ short CustomObjectScript_2886::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_11B4::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_11B4::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5621,7 +5621,7 @@ short CustomObjectScript_11B4::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_1885::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_1885::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5639,7 +5639,7 @@ short CustomObjectScript_1885::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_28BB::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_28BB::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5657,7 +5657,7 @@ short CustomObjectScript_28BB::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_186E::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_186E::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5675,7 +5675,7 @@ short CustomObjectScript_186E::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_18F0::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_18F0::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5731,7 +5731,7 @@ short CustomObjectScript_18F0::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_19BE::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_19BE::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5787,7 +5787,7 @@ short CustomObjectScript_19BE::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_18F1::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_18F1::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5843,7 +5843,7 @@ short CustomObjectScript_18F1::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_19C0::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_19C0::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5899,7 +5899,7 @@ short CustomObjectScript_19C0::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_18EE::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_18EE::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5920,7 +5920,7 @@ short CustomObjectScript_18EE::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_20CD::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_20CD::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5941,7 +5941,7 @@ short CustomObjectScript_20CD::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_28CC::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_28CC::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5962,7 +5962,7 @@ short CustomObjectScript_28CC::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_10B2::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_10B2::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5983,7 +5983,7 @@ short CustomObjectScript_10B2::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_18C1::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_18C1::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -6004,7 +6004,7 @@ short CustomObjectScript_18C1::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_21B8::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_21B8::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -6026,7 +6026,7 @@ short CustomObjectScript_21B8::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_21B9::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_21B9::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -6048,7 +6048,7 @@ short CustomObjectScript_21B9::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_080A::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_080A::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -6070,7 +6070,7 @@ short CustomObjectScript_080A::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_080C::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_080C::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -6092,7 +6092,7 @@ short CustomObjectScript_080C::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0811::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0811::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -6114,7 +6114,7 @@ short CustomObjectScript_0811::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0012::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0012::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -6138,7 +6138,7 @@ short TriggerScript_0012::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0013::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0013::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -6166,7 +6166,7 @@ short TriggerScript_0013::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0007::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0007::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -6193,7 +6193,7 @@ short TriggerScript_0007::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0005::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0005::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -6241,7 +6241,7 @@ short TriggerScript_0005::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0003::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0003::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -6280,7 +6280,7 @@ short TriggerScript_0003::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0008::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0008::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -6319,7 +6319,7 @@ short TriggerScript_0008::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_001E::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_001E::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -6345,7 +6345,7 @@ short TriggerScript_001E::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_001F::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_001F::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -6371,7 +6371,7 @@ short TriggerScript_001F::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0001::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0001::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -6390,7 +6390,7 @@ short TriggerScript_0001::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_000B::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_000B::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -6411,7 +6411,7 @@ short TriggerScript_000B::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_000A::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_000A::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -6432,7 +6432,7 @@ short TriggerScript_000A::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_000C::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_000C::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -6453,7 +6453,7 @@ short TriggerScript_000C::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_000D::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_000D::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -6471,7 +6471,7 @@ short TriggerScript_000D::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0021::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0021::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -6491,7 +6491,7 @@ short TriggerScript_0021::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0020::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0020::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -6511,7 +6511,7 @@ short TriggerScript_0020::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -6533,7 +6533,7 @@ short TriggerScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_001A::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_001A::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -6551,7 +6551,7 @@ short TriggerScript_001A::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0019::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0019::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -6569,7 +6569,7 @@ short TriggerScript_0019::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_000E::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_000E::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -6587,7 +6587,7 @@ short TriggerScript_000E::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_001B::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_001B::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -6605,7 +6605,7 @@ short TriggerScript_001B::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0018::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0018::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -6623,7 +6623,7 @@ short TriggerScript_0018::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0017::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0017::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -6641,7 +6641,7 @@ short TriggerScript_0017::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0016::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0016::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -6659,7 +6659,7 @@ short TriggerScript_0016::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0015::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0015::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -6677,7 +6677,7 @@ short TriggerScript_0015::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_001D::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_001D::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -6695,7 +6695,7 @@ short TriggerScript_001D::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_001C::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_001C::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -6713,7 +6713,7 @@ short TriggerScript_001C::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_000F::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_000F::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -6731,7 +6731,7 @@ short TriggerScript_000F::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0010::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0010::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; diff --git a/scripts/Level16.cpp b/scripts/Level16.cpp index e0700e78..cc044886 100644 --- a/scripts/Level16.cpp +++ b/scripts/Level16.cpp @@ -40,7 +40,7 @@ DLLEXPORT void STDCALL ShutdownDLL(void); DLLEXPORT int STDCALL GetGOScriptID(const char *name, uint8_t is_door); DLLEXPORT void STDCALLPTR CreateInstance(int id); DLLEXPORT void STDCALL DestroyInstance(int id, void *ptr); -DLLEXPORT short STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data); +DLLEXPORT int16_t STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data); DLLEXPORT int STDCALL GetTriggerScriptID(int trigger_room, int trigger_face); DLLEXPORT int STDCALL GetCOScriptList(int **list, int **id_list); DLLEXPORT int STDCALL SaveRestoreState(void *file_ptr, uint8_t saving_state); @@ -69,42 +69,42 @@ class BaseScript { public: BaseScript(); ~BaseScript(); - virtual short CallEvent(int event, tOSIRISEventInfo *data); + virtual int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class LevelScript_0000 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_4010 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0804 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0001 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0002 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0004 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0003 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; // ====================== @@ -593,7 +593,7 @@ void STDCALL DestroyInstance(int id, void *ptr) { // =================== // CallInstanceEvent() // =================== -short STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data) { +int16_t STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data) { switch (id) { case ID_LEVEL_0000: case ID_CUSTOM_OBJECT_4010: @@ -660,12 +660,12 @@ BaseScript::BaseScript() {} BaseScript::~BaseScript() {} -short BaseScript::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t BaseScript::CallEvent(int event, tOSIRISEventInfo *data) { mprintf(0, "BaseScript::CallEvent()\n"); return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_SAVESTATE: { tOSIRISEVTSAVESTATE *event_data = &data->evt_savestate; @@ -731,7 +731,7 @@ short LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_4010::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_4010::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -779,7 +779,7 @@ short CustomObjectScript_4010::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0804::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0804::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -798,7 +798,7 @@ short CustomObjectScript_0804::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0001::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0001::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -889,7 +889,7 @@ short TriggerScript_0001::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0002::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0002::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -952,7 +952,7 @@ short TriggerScript_0002::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0004::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0004::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -971,7 +971,7 @@ short TriggerScript_0004::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0003::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0003::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; diff --git a/scripts/Level6.cpp b/scripts/Level6.cpp index 3e6356da..d7e15086 100644 --- a/scripts/Level6.cpp +++ b/scripts/Level6.cpp @@ -40,7 +40,7 @@ DLLEXPORT void STDCALL ShutdownDLL(void); DLLEXPORT int STDCALL GetGOScriptID(const char *name, uint8_t is_door); DLLEXPORT void STDCALLPTR CreateInstance(int id); DLLEXPORT void STDCALL DestroyInstance(int id, void *ptr); -DLLEXPORT short STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data); +DLLEXPORT int16_t STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data); DLLEXPORT int STDCALL GetTriggerScriptID(int trigger_room, int trigger_face); DLLEXPORT int STDCALL GetCOScriptList(int **list, int **id_list); DLLEXPORT int STDCALL SaveRestoreState(void *file_ptr, uint8_t saving_state); @@ -119,292 +119,292 @@ class BaseScript { public: BaseScript(); ~BaseScript(); - virtual short CallEvent(int event, tOSIRISEventInfo *data); + virtual int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class LevelScript_0000 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_208F : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_20BE : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_206F : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_10A5 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_081D : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_081E : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_08F7 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_081C : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_081B : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_10C7 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_18B9 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_2051 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_1826 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_08FD : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_180A : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_216E : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_3167 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_1964 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_316A : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_216B : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0015 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0013 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_001F : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0020 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_001C : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0016 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0001 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0002 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0004 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0003 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0005 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0006 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0008 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0007 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_000A : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0009 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_000B : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_000C : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_000E : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_000D : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_000F : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0011 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0010 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_001E : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_001B : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0019 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_001D : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_001A : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0018 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0014 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0012 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0017 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0025 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0024 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0021 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0022 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; // ====================== @@ -2147,7 +2147,7 @@ void STDCALL DestroyInstance(int id, void *ptr) { // =================== // CallInstanceEvent() // =================== -short STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data) { +int16_t STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data) { switch (id) { case ID_LEVEL_0000: case ID_CUSTOM_OBJECT_208F: @@ -2383,12 +2383,12 @@ BaseScript::BaseScript() {} BaseScript::~BaseScript() {} -short BaseScript::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t BaseScript::CallEvent(int event, tOSIRISEventInfo *data) { mprintf(0, "BaseScript::CallEvent()\n"); return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_SAVESTATE: { tOSIRISEVTSAVESTATE *event_data = &data->evt_savestate; @@ -2847,7 +2847,7 @@ short LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_208F::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_208F::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -2931,7 +2931,7 @@ short CustomObjectScript_208F::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_20BE::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_20BE::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -2978,7 +2978,7 @@ short CustomObjectScript_20BE::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_206F::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_206F::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3063,7 +3063,7 @@ short CustomObjectScript_206F::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_10A5::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_10A5::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3082,7 +3082,7 @@ short CustomObjectScript_10A5::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_081D::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_081D::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3106,7 +3106,7 @@ short CustomObjectScript_081D::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_081E::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_081E::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3130,7 +3130,7 @@ short CustomObjectScript_081E::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_08F7::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_08F7::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { tOSIRISEVTCREATED *event_data = &data->evt_created; @@ -3161,7 +3161,7 @@ short CustomObjectScript_08F7::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_081C::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_081C::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3188,7 +3188,7 @@ short CustomObjectScript_081C::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_081B::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_081B::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3215,7 +3215,7 @@ short CustomObjectScript_081B::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_10C7::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_10C7::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_DESTROY: { tOSIRISEVTDESTROY *event_data = &data->evt_destroy; @@ -3245,7 +3245,7 @@ short CustomObjectScript_10C7::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_18B9::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_18B9::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_DESTROY: { tOSIRISEVTDESTROY *event_data = &data->evt_destroy; @@ -3275,7 +3275,7 @@ short CustomObjectScript_18B9::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_2051::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_2051::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3295,7 +3295,7 @@ short CustomObjectScript_2051::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_1826::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_1826::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_INTERVAL: { tOSIRISEVTINTERVAL *event_data = &data->evt_interval; @@ -3368,7 +3368,7 @@ short CustomObjectScript_1826::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_08FD::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_08FD::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_AIN_GOALCOMPLETE: { tOSIRISEVTAINOTIFY *event_data = &data->evt_ain_goalcomplete; @@ -3424,7 +3424,7 @@ short CustomObjectScript_08FD::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_180A::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_180A::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3444,7 +3444,7 @@ short CustomObjectScript_180A::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_216E::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_216E::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_INTERVAL: { tOSIRISEVTINTERVAL *event_data = &data->evt_interval; @@ -3464,7 +3464,7 @@ short CustomObjectScript_216E::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_3167::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_3167::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_INTERVAL: { tOSIRISEVTINTERVAL *event_data = &data->evt_interval; @@ -3484,7 +3484,7 @@ short CustomObjectScript_3167::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_1964::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_1964::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_INTERVAL: { tOSIRISEVTINTERVAL *event_data = &data->evt_interval; @@ -3504,7 +3504,7 @@ short CustomObjectScript_1964::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_316A::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_316A::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_INTERVAL: { tOSIRISEVTINTERVAL *event_data = &data->evt_interval; @@ -3524,7 +3524,7 @@ short CustomObjectScript_316A::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_216B::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_216B::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_INTERVAL: { tOSIRISEVTINTERVAL *event_data = &data->evt_interval; @@ -3544,7 +3544,7 @@ short CustomObjectScript_216B::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0015::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0015::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3580,7 +3580,7 @@ short TriggerScript_0015::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0013::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0013::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3607,7 +3607,7 @@ short TriggerScript_0013::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_001F::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_001F::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3625,7 +3625,7 @@ short TriggerScript_001F::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0020::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0020::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3643,7 +3643,7 @@ short TriggerScript_0020::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_001C::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_001C::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3679,7 +3679,7 @@ short TriggerScript_001C::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0016::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0016::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3715,7 +3715,7 @@ short TriggerScript_0016::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0001::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0001::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3743,7 +3743,7 @@ short TriggerScript_0001::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0002::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0002::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3771,7 +3771,7 @@ short TriggerScript_0002::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0004::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0004::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3792,7 +3792,7 @@ short TriggerScript_0004::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0003::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0003::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3813,7 +3813,7 @@ short TriggerScript_0003::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0005::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0005::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3834,7 +3834,7 @@ short TriggerScript_0005::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0006::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0006::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3855,7 +3855,7 @@ short TriggerScript_0006::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0008::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0008::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3876,7 +3876,7 @@ short TriggerScript_0008::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0007::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0007::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3897,7 +3897,7 @@ short TriggerScript_0007::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_000A::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_000A::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3918,7 +3918,7 @@ short TriggerScript_000A::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0009::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0009::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3939,7 +3939,7 @@ short TriggerScript_0009::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_000B::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_000B::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3960,7 +3960,7 @@ short TriggerScript_000B::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_000C::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_000C::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3981,7 +3981,7 @@ short TriggerScript_000C::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_000E::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_000E::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -4002,7 +4002,7 @@ short TriggerScript_000E::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_000D::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_000D::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -4023,7 +4023,7 @@ short TriggerScript_000D::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_000F::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_000F::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -4053,7 +4053,7 @@ short TriggerScript_000F::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0011::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0011::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -4071,7 +4071,7 @@ short TriggerScript_0011::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0010::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0010::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -4092,7 +4092,7 @@ short TriggerScript_0010::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_001E::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_001E::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -4110,7 +4110,7 @@ short TriggerScript_001E::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_001B::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_001B::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -4128,7 +4128,7 @@ short TriggerScript_001B::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0019::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0019::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -4146,7 +4146,7 @@ short TriggerScript_0019::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_001D::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_001D::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -4164,7 +4164,7 @@ short TriggerScript_001D::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_001A::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_001A::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -4182,7 +4182,7 @@ short TriggerScript_001A::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0018::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0018::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -4200,7 +4200,7 @@ short TriggerScript_0018::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0014::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0014::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -4218,7 +4218,7 @@ short TriggerScript_0014::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0012::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0012::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -4236,7 +4236,7 @@ short TriggerScript_0012::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0017::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0017::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -4254,7 +4254,7 @@ short TriggerScript_0017::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0025::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0025::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -4273,7 +4273,7 @@ short TriggerScript_0025::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0024::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0024::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -4292,7 +4292,7 @@ short TriggerScript_0024::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0021::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0021::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -4311,7 +4311,7 @@ short TriggerScript_0021::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0022::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0022::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; diff --git a/scripts/Level9.cpp b/scripts/Level9.cpp index 76370393..9ad2497d 100644 --- a/scripts/Level9.cpp +++ b/scripts/Level9.cpp @@ -40,7 +40,7 @@ DLLEXPORT void STDCALL ShutdownDLL(void); DLLEXPORT int STDCALL GetGOScriptID(const char *name, uint8_t is_door); DLLEXPORT void STDCALLPTR CreateInstance(int id); DLLEXPORT void STDCALL DestroyInstance(int id, void *ptr); -DLLEXPORT short STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data); +DLLEXPORT int16_t STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data); DLLEXPORT int STDCALL GetTriggerScriptID(int trigger_room, int trigger_face); DLLEXPORT int STDCALL GetCOScriptList(int **list, int **id_list); DLLEXPORT int STDCALL SaveRestoreState(void *file_ptr, uint8_t saving_state); @@ -107,232 +107,232 @@ class BaseScript { public: BaseScript(); ~BaseScript(); - virtual short CallEvent(int event, tOSIRISEventInfo *data); + virtual int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class LevelScript_0000 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_081B : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_18D5 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_18D6 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_1030 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_1038 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0869 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_086A : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_106E : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_106F : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_106D : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_106C : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_100F : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0871 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0811 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0810 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_080E : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0873 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0872 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_2070 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_18AA : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_18C1 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0948 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0949 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_18AC : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_094E : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0001 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0002 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0003 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0013 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0012 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0010 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0011 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_000F : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_000E : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_000D : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_000C : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_000B : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_000A : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0009 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0008 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0007 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0006 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0005 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0004 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; // ====================== @@ -1408,7 +1408,7 @@ void STDCALL DestroyInstance(int id, void *ptr) { // =================== // CallInstanceEvent() // =================== -short STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data) { +int16_t STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data) { switch (id) { case ID_LEVEL_0000: case ID_CUSTOM_OBJECT_081B: @@ -1588,12 +1588,12 @@ BaseScript::BaseScript() {} BaseScript::~BaseScript() {} -short BaseScript::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t BaseScript::CallEvent(int event, tOSIRISEventInfo *data) { mprintf(0, "BaseScript::CallEvent()\n"); return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_SAVESTATE: { tOSIRISEVTSAVESTATE *event_data = &data->evt_savestate; @@ -1765,7 +1765,7 @@ short LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_081B::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_081B::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -2128,7 +2128,7 @@ short CustomObjectScript_081B::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_18D5::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_18D5::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_AIN_GOALCOMPLETE: { tOSIRISEVTAINOTIFY *event_data = &data->evt_ain_goalcomplete; @@ -2146,7 +2146,7 @@ short CustomObjectScript_18D5::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_18D6::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_18D6::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_AIN_GOALCOMPLETE: { tOSIRISEVTAINOTIFY *event_data = &data->evt_ain_goalcomplete; @@ -2164,7 +2164,7 @@ short CustomObjectScript_18D6::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_1030::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_1030::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -2193,7 +2193,7 @@ short CustomObjectScript_1030::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_1038::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_1038::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -2222,7 +2222,7 @@ short CustomObjectScript_1038::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0869::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0869::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -2251,7 +2251,7 @@ short CustomObjectScript_0869::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_086A::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_086A::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -2280,7 +2280,7 @@ short CustomObjectScript_086A::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_106E::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_106E::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -2338,7 +2338,7 @@ short CustomObjectScript_106E::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_106F::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_106F::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -2396,7 +2396,7 @@ short CustomObjectScript_106F::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_106D::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_106D::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -2454,7 +2454,7 @@ short CustomObjectScript_106D::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_106C::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_106C::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -2512,7 +2512,7 @@ short CustomObjectScript_106C::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_100F::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_100F::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -2549,7 +2549,7 @@ short CustomObjectScript_100F::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0871::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0871::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -2572,7 +2572,7 @@ short CustomObjectScript_0871::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0811::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0811::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -2609,7 +2609,7 @@ short CustomObjectScript_0811::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0810::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0810::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -2646,7 +2646,7 @@ short CustomObjectScript_0810::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_080E::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_080E::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -2683,7 +2683,7 @@ short CustomObjectScript_080E::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0873::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0873::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -2706,7 +2706,7 @@ short CustomObjectScript_0873::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0872::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0872::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -2729,7 +2729,7 @@ short CustomObjectScript_0872::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_2070::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_2070::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -2752,7 +2752,7 @@ short CustomObjectScript_2070::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_18AA::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_18AA::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_DESTROY: { tOSIRISEVTDESTROY *event_data = &data->evt_destroy; @@ -2775,7 +2775,7 @@ short CustomObjectScript_18AA::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_18C1::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_18C1::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_DESTROY: { tOSIRISEVTDESTROY *event_data = &data->evt_destroy; @@ -2798,7 +2798,7 @@ short CustomObjectScript_18C1::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0948::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0948::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_DESTROY: { tOSIRISEVTDESTROY *event_data = &data->evt_destroy; @@ -2821,7 +2821,7 @@ short CustomObjectScript_0948::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0949::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0949::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_DESTROY: { tOSIRISEVTDESTROY *event_data = &data->evt_destroy; @@ -2844,7 +2844,7 @@ short CustomObjectScript_0949::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_18AC::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_18AC::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_DESTROY: { tOSIRISEVTDESTROY *event_data = &data->evt_destroy; @@ -2867,7 +2867,7 @@ short CustomObjectScript_18AC::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_094E::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_094E::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -2914,7 +2914,7 @@ short CustomObjectScript_094E::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0001::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0001::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -2941,7 +2941,7 @@ short TriggerScript_0001::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0002::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0002::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -2968,7 +2968,7 @@ short TriggerScript_0002::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0003::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0003::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -2995,7 +2995,7 @@ short TriggerScript_0003::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0013::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0013::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3013,7 +3013,7 @@ short TriggerScript_0013::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0012::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0012::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3040,7 +3040,7 @@ short TriggerScript_0012::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0010::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0010::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3058,7 +3058,7 @@ short TriggerScript_0010::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0011::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0011::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3076,7 +3076,7 @@ short TriggerScript_0011::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_000F::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_000F::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3094,7 +3094,7 @@ short TriggerScript_000F::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_000E::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_000E::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3112,7 +3112,7 @@ short TriggerScript_000E::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_000D::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_000D::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3139,7 +3139,7 @@ short TriggerScript_000D::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_000C::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_000C::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3157,7 +3157,7 @@ short TriggerScript_000C::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_000B::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_000B::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3175,7 +3175,7 @@ short TriggerScript_000B::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_000A::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_000A::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3202,7 +3202,7 @@ short TriggerScript_000A::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0009::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0009::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3220,7 +3220,7 @@ short TriggerScript_0009::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0008::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0008::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3238,7 +3238,7 @@ short TriggerScript_0008::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0007::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0007::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3256,7 +3256,7 @@ short TriggerScript_0007::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0006::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0006::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3283,7 +3283,7 @@ short TriggerScript_0006::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0005::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0005::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3301,7 +3301,7 @@ short TriggerScript_0005::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0004::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0004::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; diff --git a/scripts/LevelS1.cpp b/scripts/LevelS1.cpp index 27e6c45f..479ed210 100644 --- a/scripts/LevelS1.cpp +++ b/scripts/LevelS1.cpp @@ -40,7 +40,7 @@ DLLEXPORT void STDCALL ShutdownDLL(void); DLLEXPORT int STDCALL GetGOScriptID(const char *name, uint8_t is_door); DLLEXPORT void STDCALLPTR CreateInstance(int id); DLLEXPORT void STDCALL DestroyInstance(int id, void *ptr); -DLLEXPORT short STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data); +DLLEXPORT int16_t STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data); DLLEXPORT int STDCALL GetTriggerScriptID(int trigger_room, int trigger_face); DLLEXPORT int STDCALL GetCOScriptList(int **list, int **id_list); DLLEXPORT int STDCALL SaveRestoreState(void *file_ptr, uint8_t saving_state); @@ -70,47 +70,47 @@ class BaseScript { public: BaseScript(); ~BaseScript(); - virtual short CallEvent(int event, tOSIRISEventInfo *data); + virtual int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class LevelScript_0000 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0804 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0002 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0004 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0003 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0007 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0006 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0005 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; // ====================== @@ -630,7 +630,7 @@ void STDCALL DestroyInstance(int id, void *ptr) { // =================== // CallInstanceEvent() // =================== -short STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data) { +int16_t STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data) { switch (id) { case ID_LEVEL_0000: case ID_CUSTOM_OBJECT_0804: @@ -703,12 +703,12 @@ BaseScript::BaseScript() {} BaseScript::~BaseScript() {} -short BaseScript::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t BaseScript::CallEvent(int event, tOSIRISEventInfo *data) { mprintf(0, "BaseScript::CallEvent()\n"); return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_SAVESTATE: { tOSIRISEVTSAVESTATE *event_data = &data->evt_savestate; @@ -903,7 +903,7 @@ short LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0804::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0804::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -922,7 +922,7 @@ short CustomObjectScript_0804::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0002::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0002::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -942,7 +942,7 @@ short TriggerScript_0002::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0004::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0004::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -967,7 +967,7 @@ short TriggerScript_0004::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0003::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0003::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -992,7 +992,7 @@ short TriggerScript_0003::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0007::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0007::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -1010,7 +1010,7 @@ short TriggerScript_0007::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0006::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0006::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -1028,7 +1028,7 @@ short TriggerScript_0006::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0005::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0005::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; diff --git a/scripts/Merc02.cpp b/scripts/Merc02.cpp index 2ee7350f..7379b4df 100644 --- a/scripts/Merc02.cpp +++ b/scripts/Merc02.cpp @@ -40,7 +40,7 @@ DLLEXPORT void STDCALL ShutdownDLL(void); DLLEXPORT int STDCALL GetGOScriptID(const char *name, uint8_t is_door); DLLEXPORT void STDCALLPTR CreateInstance(int id); DLLEXPORT void STDCALL DestroyInstance(int id, void *ptr); -DLLEXPORT short STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data); +DLLEXPORT int16_t STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data); DLLEXPORT int STDCALL GetTriggerScriptID(int trigger_room, int trigger_face); DLLEXPORT int STDCALL GetCOScriptList(int **list, int **id_list); DLLEXPORT int STDCALL SaveRestoreState(void *file_ptr, uint8_t saving_state); @@ -125,322 +125,322 @@ class BaseScript { public: BaseScript(); ~BaseScript(); - virtual short CallEvent(int event, tOSIRISEventInfo *data); + virtual int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class LevelScript_0000 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_1119 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_10EC : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_08F6 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_08F8 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_08F7 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_08FB : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_08FC : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_08FE : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_08FD : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_08FF : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0900 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0901 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0902 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_1017 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0818 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_1019 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_10CF : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_30B2 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_10B1 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_1040 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_1041 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_103F : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_08DE : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_110E : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_10CD : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_08A6 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_08A5 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_1112 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0913 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_083D : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_084A : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_1048 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_1111 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_1067 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_088C : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_108B : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0883 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_1884 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_106F : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_1071 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0894 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0893 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0806 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_1842 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_082F : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0006 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0005 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0004 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0000 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0001 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0002 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0003 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0007 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0008 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0011 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0009 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_000A : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_000B : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_000C : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_000E : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_000F : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0010 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; // ====================== @@ -2181,7 +2181,7 @@ void STDCALL DestroyInstance(int id, void *ptr) { // =================== // CallInstanceEvent() // =================== -short STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data) { +int16_t STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data) { switch (id) { case ID_LEVEL_0000: case ID_CUSTOM_OBJECT_1119: @@ -2398,12 +2398,12 @@ BaseScript::BaseScript() {} BaseScript::~BaseScript() {} -short BaseScript::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t BaseScript::CallEvent(int event, tOSIRISEventInfo *data) { mprintf(0, "BaseScript::CallEvent()\n"); return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_SAVESTATE: { tOSIRISEVTSAVESTATE *event_data = &data->evt_savestate; @@ -3590,7 +3590,7 @@ short LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_1119::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_1119::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3654,7 +3654,7 @@ short CustomObjectScript_1119::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_10EC::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_10EC::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_AIN_GOALCOMPLETE: { tOSIRISEVTAINOTIFY *event_data = &data->evt_ain_goalcomplete; @@ -3687,7 +3687,7 @@ short CustomObjectScript_10EC::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_08F6::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_08F6::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_AIN_GOALCOMPLETE: { tOSIRISEVTAINOTIFY *event_data = &data->evt_ain_goalcomplete; @@ -3720,7 +3720,7 @@ short CustomObjectScript_08F6::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_08F8::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_08F8::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_AIN_GOALCOMPLETE: { tOSIRISEVTAINOTIFY *event_data = &data->evt_ain_goalcomplete; @@ -3753,7 +3753,7 @@ short CustomObjectScript_08F8::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_08F7::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_08F7::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_AIN_GOALCOMPLETE: { tOSIRISEVTAINOTIFY *event_data = &data->evt_ain_goalcomplete; @@ -3786,7 +3786,7 @@ short CustomObjectScript_08F7::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_08FB::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_08FB::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_AIN_GOALCOMPLETE: { tOSIRISEVTAINOTIFY *event_data = &data->evt_ain_goalcomplete; @@ -3819,7 +3819,7 @@ short CustomObjectScript_08FB::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_08FC::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_08FC::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_AIN_GOALCOMPLETE: { tOSIRISEVTAINOTIFY *event_data = &data->evt_ain_goalcomplete; @@ -3852,7 +3852,7 @@ short CustomObjectScript_08FC::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_08FE::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_08FE::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_AIN_GOALCOMPLETE: { tOSIRISEVTAINOTIFY *event_data = &data->evt_ain_goalcomplete; @@ -3885,7 +3885,7 @@ short CustomObjectScript_08FE::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_08FD::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_08FD::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_AIN_GOALCOMPLETE: { tOSIRISEVTAINOTIFY *event_data = &data->evt_ain_goalcomplete; @@ -3918,7 +3918,7 @@ short CustomObjectScript_08FD::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_08FF::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_08FF::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_AIN_GOALCOMPLETE: { tOSIRISEVTAINOTIFY *event_data = &data->evt_ain_goalcomplete; @@ -3951,7 +3951,7 @@ short CustomObjectScript_08FF::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0900::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0900::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_AIN_GOALCOMPLETE: { tOSIRISEVTAINOTIFY *event_data = &data->evt_ain_goalcomplete; @@ -3984,7 +3984,7 @@ short CustomObjectScript_0900::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0901::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0901::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_AIN_GOALCOMPLETE: { tOSIRISEVTAINOTIFY *event_data = &data->evt_ain_goalcomplete; @@ -4017,7 +4017,7 @@ short CustomObjectScript_0901::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0902::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0902::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_AIN_GOALCOMPLETE: { tOSIRISEVTAINOTIFY *event_data = &data->evt_ain_goalcomplete; @@ -4050,7 +4050,7 @@ short CustomObjectScript_0902::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_1017::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_1017::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_DESTROY: { tOSIRISEVTDESTROY *event_data = &data->evt_destroy; @@ -4073,7 +4073,7 @@ short CustomObjectScript_1017::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0818::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0818::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_DESTROY: { tOSIRISEVTDESTROY *event_data = &data->evt_destroy; @@ -4103,7 +4103,7 @@ short CustomObjectScript_0818::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_1019::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_1019::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_DESTROY: { tOSIRISEVTDESTROY *event_data = &data->evt_destroy; @@ -4133,7 +4133,7 @@ short CustomObjectScript_1019::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_10CF::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_10CF::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -4158,7 +4158,7 @@ short CustomObjectScript_10CF::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_30B2::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_30B2::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -4176,7 +4176,7 @@ short CustomObjectScript_30B2::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_10B1::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_10B1::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -4194,7 +4194,7 @@ short CustomObjectScript_10B1::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_1040::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_1040::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -4212,7 +4212,7 @@ short CustomObjectScript_1040::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_1041::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_1041::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -4230,7 +4230,7 @@ short CustomObjectScript_1041::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_103F::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_103F::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_DESTROY: { tOSIRISEVTDESTROY *event_data = &data->evt_destroy; @@ -4262,7 +4262,7 @@ short CustomObjectScript_103F::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_08DE::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_08DE::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_DESTROY: { tOSIRISEVTDESTROY *event_data = &data->evt_destroy; @@ -4286,7 +4286,7 @@ short CustomObjectScript_08DE::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_110E::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_110E::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_DESTROY: { tOSIRISEVTDESTROY *event_data = &data->evt_destroy; @@ -4345,7 +4345,7 @@ short CustomObjectScript_110E::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_10CD::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_10CD::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -4381,7 +4381,7 @@ short CustomObjectScript_10CD::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_08A6::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_08A6::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_DESTROY: { tOSIRISEVTDESTROY *event_data = &data->evt_destroy; @@ -4411,7 +4411,7 @@ short CustomObjectScript_08A6::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_08A5::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_08A5::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_DESTROY: { tOSIRISEVTDESTROY *event_data = &data->evt_destroy; @@ -4441,7 +4441,7 @@ short CustomObjectScript_08A5::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_1112::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_1112::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -4462,7 +4462,7 @@ short CustomObjectScript_1112::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0913::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0913::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -4485,7 +4485,7 @@ short CustomObjectScript_0913::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_083D::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_083D::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_INTERVAL: { tOSIRISEVTINTERVAL *event_data = &data->evt_interval; @@ -4503,7 +4503,7 @@ short CustomObjectScript_083D::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_084A::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_084A::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_INTERVAL: { tOSIRISEVTINTERVAL *event_data = &data->evt_interval; @@ -4525,7 +4525,7 @@ short CustomObjectScript_084A::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_1048::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_1048::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -4545,7 +4545,7 @@ short CustomObjectScript_1048::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_1111::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_1111::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_INTERVAL: { tOSIRISEVTINTERVAL *event_data = &data->evt_interval; @@ -4567,7 +4567,7 @@ short CustomObjectScript_1111::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_1067::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_1067::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -4587,7 +4587,7 @@ short CustomObjectScript_1067::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_088C::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_088C::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_INTERVAL: { tOSIRISEVTINTERVAL *event_data = &data->evt_interval; @@ -4609,7 +4609,7 @@ short CustomObjectScript_088C::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_108B::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_108B::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -4629,7 +4629,7 @@ short CustomObjectScript_108B::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0883::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0883::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_INTERVAL: { tOSIRISEVTINTERVAL *event_data = &data->evt_interval; @@ -4651,7 +4651,7 @@ short CustomObjectScript_0883::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_1884::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_1884::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -4671,7 +4671,7 @@ short CustomObjectScript_1884::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_106F::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_106F::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_INTERVAL: { tOSIRISEVTINTERVAL *event_data = &data->evt_interval; @@ -4693,7 +4693,7 @@ short CustomObjectScript_106F::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_1071::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_1071::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -4713,7 +4713,7 @@ short CustomObjectScript_1071::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0894::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0894::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_INTERVAL: { tOSIRISEVTINTERVAL *event_data = &data->evt_interval; @@ -4735,7 +4735,7 @@ short CustomObjectScript_0894::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0893::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0893::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -4755,7 +4755,7 @@ short CustomObjectScript_0893::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0806::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0806::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -4779,7 +4779,7 @@ short CustomObjectScript_0806::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_1842::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_1842::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -4797,7 +4797,7 @@ short CustomObjectScript_1842::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_082F::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_082F::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_AIN_GOALCOMPLETE: { tOSIRISEVTAINOTIFY *event_data = &data->evt_ain_goalcomplete; @@ -4828,7 +4828,7 @@ short CustomObjectScript_082F::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0006::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0006::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -4848,7 +4848,7 @@ short TriggerScript_0006::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0005::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0005::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -4876,7 +4876,7 @@ short TriggerScript_0005::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0004::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0004::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -4904,7 +4904,7 @@ short TriggerScript_0004::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -4932,7 +4932,7 @@ short TriggerScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0001::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0001::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -4960,7 +4960,7 @@ short TriggerScript_0001::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0002::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0002::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -4982,7 +4982,7 @@ short TriggerScript_0002::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0003::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0003::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5002,7 +5002,7 @@ short TriggerScript_0003::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0007::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0007::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5020,7 +5020,7 @@ short TriggerScript_0007::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0008::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0008::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5040,7 +5040,7 @@ short TriggerScript_0008::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0011::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0011::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5058,7 +5058,7 @@ short TriggerScript_0011::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0009::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0009::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5081,7 +5081,7 @@ short TriggerScript_0009::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_000A::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_000A::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5104,7 +5104,7 @@ short TriggerScript_000A::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_000B::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_000B::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5125,7 +5125,7 @@ short TriggerScript_000B::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_000C::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_000C::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5146,7 +5146,7 @@ short TriggerScript_000C::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_000E::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_000E::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5168,7 +5168,7 @@ short TriggerScript_000E::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_000F::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_000F::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5189,7 +5189,7 @@ short TriggerScript_000F::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0010::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0010::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; diff --git a/scripts/Merc1.cpp b/scripts/Merc1.cpp index 916736ed..27442b04 100644 --- a/scripts/Merc1.cpp +++ b/scripts/Merc1.cpp @@ -40,7 +40,7 @@ DLLEXPORT void STDCALL ShutdownDLL(void); DLLEXPORT int STDCALL GetGOScriptID(const char *name, uint8_t is_door); DLLEXPORT void STDCALLPTR CreateInstance(int id); DLLEXPORT void STDCALL DestroyInstance(int id, void *ptr); -DLLEXPORT short STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data); +DLLEXPORT int16_t STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data); DLLEXPORT int STDCALL GetTriggerScriptID(int trigger_room, int trigger_face); DLLEXPORT int STDCALL GetCOScriptList(int **list, int **id_list); DLLEXPORT int STDCALL SaveRestoreState(void *file_ptr, uint8_t saving_state); @@ -175,572 +175,572 @@ class BaseScript { public: BaseScript(); ~BaseScript(); - virtual short CallEvent(int event, tOSIRISEventInfo *data); + virtual int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class LevelScript_0000 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_2027 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0820 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0831 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0832 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0836 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0888 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0887 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0886 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_182A : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_088A : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0889 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_188C : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0885 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_096D : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0877 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0878 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0879 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_1171 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_087A : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_087B : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_087C : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_087D : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_1170 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0988 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0981 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0980 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_097F : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_097E : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_097D : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_097C : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_117B : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_097A : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_1984 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0875 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0865 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0864 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0863 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0862 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_08A1 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_08A0 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_089F : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_109E : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_109C : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_08AE : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_18A6 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_18A5 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_18A4 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_18A7 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_18A9 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_20A3 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_28A2 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_18A8 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_08DA : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_08D9 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_08D8 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_08D7 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_08D6 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_08D5 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_08D4 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_08D3 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_08D2 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_08D1 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_08D0 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_08CF : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_105C : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_2059 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0858 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0857 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_1030 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_402F : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_1871 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_091A : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0919 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0918 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0917 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0925 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0924 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0923 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0922 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0921 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_1120 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_111F : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_111E : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_112E : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0932 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0931 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_080F : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0967 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0966 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0809 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_000B : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_000A : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0007 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0006 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0004 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0003 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0001 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_000D : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_000C : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0009 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0008 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0005 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0002 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0000 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0013 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0012 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_000F : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_000E : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0011 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0010 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0014 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0015 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; // ====================== @@ -3041,7 +3041,7 @@ void STDCALL DestroyInstance(int id, void *ptr) { // =================== // CallInstanceEvent() // =================== -short STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data) { +int16_t STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data) { switch (id) { case ID_LEVEL_0000: case ID_CUSTOM_OBJECT_2027: @@ -3379,12 +3379,12 @@ BaseScript::BaseScript() {} BaseScript::~BaseScript() {} -short BaseScript::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t BaseScript::CallEvent(int event, tOSIRISEventInfo *data) { mprintf(0, "BaseScript::CallEvent()\n"); return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_SAVESTATE: { tOSIRISEVTSAVESTATE *event_data = &data->evt_savestate; @@ -4251,7 +4251,7 @@ short LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_2027::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_2027::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_AIN_MOVIE_END: { tOSIRISEVTAINOTIFY *event_data = &data->evt_ain_movie_end; @@ -4273,7 +4273,7 @@ short CustomObjectScript_2027::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0820::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0820::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_AIN_MOVIE_END: { tOSIRISEVTAINOTIFY *event_data = &data->evt_ain_movie_end; @@ -4296,7 +4296,7 @@ short CustomObjectScript_0820::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0831::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0831::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_AIN_MOVIE_END: { tOSIRISEVTAINOTIFY *event_data = &data->evt_ain_movie_end; @@ -4328,7 +4328,7 @@ short CustomObjectScript_0831::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0832::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0832::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_AIN_MOVIE_END: { tOSIRISEVTAINOTIFY *event_data = &data->evt_ain_movie_end; @@ -4359,7 +4359,7 @@ short CustomObjectScript_0832::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0836::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0836::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_AIN_MOVIE_END: { tOSIRISEVTAINOTIFY *event_data = &data->evt_ain_movie_end; @@ -4403,7 +4403,7 @@ short CustomObjectScript_0836::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0888::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0888::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { tOSIRISEVTCREATED *event_data = &data->evt_created; @@ -4424,7 +4424,7 @@ short CustomObjectScript_0888::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0887::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0887::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { tOSIRISEVTCREATED *event_data = &data->evt_created; @@ -4445,7 +4445,7 @@ short CustomObjectScript_0887::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0886::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0886::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { tOSIRISEVTCREATED *event_data = &data->evt_created; @@ -4483,7 +4483,7 @@ short CustomObjectScript_0886::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_182A::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_182A::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { tOSIRISEVTCREATED *event_data = &data->evt_created; @@ -4527,7 +4527,7 @@ short CustomObjectScript_182A::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_088A::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_088A::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { tOSIRISEVTCREATED *event_data = &data->evt_created; @@ -4571,7 +4571,7 @@ short CustomObjectScript_088A::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0889::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0889::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { tOSIRISEVTCREATED *event_data = &data->evt_created; @@ -4609,7 +4609,7 @@ short CustomObjectScript_0889::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_188C::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_188C::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -4738,7 +4738,7 @@ short CustomObjectScript_188C::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0885::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0885::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -4759,7 +4759,7 @@ short CustomObjectScript_0885::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_096D::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_096D::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_AIN_MOVIE_END: { tOSIRISEVTAINOTIFY *event_data = &data->evt_ain_movie_end; @@ -4791,7 +4791,7 @@ short CustomObjectScript_096D::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0877::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0877::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -4810,7 +4810,7 @@ short CustomObjectScript_0877::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0878::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0878::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -4830,7 +4830,7 @@ short CustomObjectScript_0878::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0879::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0879::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -4853,7 +4853,7 @@ short CustomObjectScript_0879::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_1171::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_1171::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -4880,7 +4880,7 @@ short CustomObjectScript_1171::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_087A::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_087A::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -4901,7 +4901,7 @@ short CustomObjectScript_087A::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_087B::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_087B::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -4922,7 +4922,7 @@ short CustomObjectScript_087B::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_087C::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_087C::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -4943,7 +4943,7 @@ short CustomObjectScript_087C::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_087D::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_087D::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -4964,7 +4964,7 @@ short CustomObjectScript_087D::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_1170::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_1170::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_AIN_MOVIE_END: { tOSIRISEVTAINOTIFY *event_data = &data->evt_ain_movie_end; @@ -5003,7 +5003,7 @@ short CustomObjectScript_1170::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0988::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0988::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -5022,7 +5022,7 @@ short CustomObjectScript_0988::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0981::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0981::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -5047,7 +5047,7 @@ short CustomObjectScript_0981::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0980::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0980::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -5071,7 +5071,7 @@ short CustomObjectScript_0980::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_097F::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_097F::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -5092,7 +5092,7 @@ short CustomObjectScript_097F::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_097E::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_097E::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -5113,7 +5113,7 @@ short CustomObjectScript_097E::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_097D::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_097D::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -5134,7 +5134,7 @@ short CustomObjectScript_097D::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_097C::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_097C::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -5155,7 +5155,7 @@ short CustomObjectScript_097C::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_117B::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_117B::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -5176,7 +5176,7 @@ short CustomObjectScript_117B::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_097A::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_097A::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -5197,7 +5197,7 @@ short CustomObjectScript_097A::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_1984::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_1984::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_AIN_MOVIE_END: { tOSIRISEVTAINOTIFY *event_data = &data->evt_ain_movie_end; @@ -5225,7 +5225,7 @@ short CustomObjectScript_1984::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0875::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0875::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { tOSIRISEVTCREATED *event_data = &data->evt_created; @@ -5265,7 +5265,7 @@ short CustomObjectScript_0875::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0865::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0865::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { tOSIRISEVTCREATED *event_data = &data->evt_created; @@ -5305,7 +5305,7 @@ short CustomObjectScript_0865::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0864::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0864::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { tOSIRISEVTCREATED *event_data = &data->evt_created; @@ -5345,7 +5345,7 @@ short CustomObjectScript_0864::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0863::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0863::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { tOSIRISEVTCREATED *event_data = &data->evt_created; @@ -5385,7 +5385,7 @@ short CustomObjectScript_0863::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0862::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0862::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { tOSIRISEVTCREATED *event_data = &data->evt_created; @@ -5425,7 +5425,7 @@ short CustomObjectScript_0862::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_08A1::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_08A1::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -5458,7 +5458,7 @@ short CustomObjectScript_08A1::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_08A0::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_08A0::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -5491,7 +5491,7 @@ short CustomObjectScript_08A0::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_089F::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_089F::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -5524,7 +5524,7 @@ short CustomObjectScript_089F::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_109E::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_109E::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -5557,7 +5557,7 @@ short CustomObjectScript_109E::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_109C::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_109C::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -5590,7 +5590,7 @@ short CustomObjectScript_109C::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_08AE::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_08AE::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5625,7 +5625,7 @@ short CustomObjectScript_08AE::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_18A6::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_18A6::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -5644,7 +5644,7 @@ short CustomObjectScript_18A6::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_18A5::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_18A5::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -5663,7 +5663,7 @@ short CustomObjectScript_18A5::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_18A4::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_18A4::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -5682,7 +5682,7 @@ short CustomObjectScript_18A4::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_18A7::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_18A7::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -5701,7 +5701,7 @@ short CustomObjectScript_18A7::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_18A9::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_18A9::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -5720,7 +5720,7 @@ short CustomObjectScript_18A9::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_20A3::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_20A3::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -5739,7 +5739,7 @@ short CustomObjectScript_20A3::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_28A2::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_28A2::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -5758,7 +5758,7 @@ short CustomObjectScript_28A2::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_18A8::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_18A8::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -5777,7 +5777,7 @@ short CustomObjectScript_18A8::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_08DA::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_08DA::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5810,7 +5810,7 @@ short CustomObjectScript_08DA::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_08D9::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_08D9::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5843,7 +5843,7 @@ short CustomObjectScript_08D9::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_08D8::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_08D8::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5876,7 +5876,7 @@ short CustomObjectScript_08D8::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_08D7::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_08D7::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5909,7 +5909,7 @@ short CustomObjectScript_08D7::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_08D6::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_08D6::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5942,7 +5942,7 @@ short CustomObjectScript_08D6::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_08D5::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_08D5::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5975,7 +5975,7 @@ short CustomObjectScript_08D5::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_08D4::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_08D4::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -6008,7 +6008,7 @@ short CustomObjectScript_08D4::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_08D3::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_08D3::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -6041,7 +6041,7 @@ short CustomObjectScript_08D3::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_08D2::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_08D2::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -6074,7 +6074,7 @@ short CustomObjectScript_08D2::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_08D1::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_08D1::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -6107,7 +6107,7 @@ short CustomObjectScript_08D1::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_08D0::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_08D0::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -6140,7 +6140,7 @@ short CustomObjectScript_08D0::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_08CF::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_08CF::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -6173,7 +6173,7 @@ short CustomObjectScript_08CF::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_105C::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_105C::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -6214,7 +6214,7 @@ short CustomObjectScript_105C::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_2059::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_2059::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -6255,7 +6255,7 @@ short CustomObjectScript_2059::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0858::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0858::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -6296,7 +6296,7 @@ short CustomObjectScript_0858::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0857::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0857::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -6337,7 +6337,7 @@ short CustomObjectScript_0857::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_1030::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_1030::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -6378,7 +6378,7 @@ short CustomObjectScript_1030::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_402F::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_402F::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -6419,7 +6419,7 @@ short CustomObjectScript_402F::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_1871::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_1871::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -6439,7 +6439,7 @@ short CustomObjectScript_1871::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_091A::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_091A::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -6472,7 +6472,7 @@ short CustomObjectScript_091A::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0919::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0919::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -6505,7 +6505,7 @@ short CustomObjectScript_0919::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0918::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0918::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -6538,7 +6538,7 @@ short CustomObjectScript_0918::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0917::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0917::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -6556,7 +6556,7 @@ short CustomObjectScript_0917::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0925::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0925::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { tOSIRISEVTCREATED *event_data = &data->evt_created; @@ -6594,7 +6594,7 @@ short CustomObjectScript_0925::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0924::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0924::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { tOSIRISEVTCREATED *event_data = &data->evt_created; @@ -6632,7 +6632,7 @@ short CustomObjectScript_0924::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0923::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0923::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { tOSIRISEVTCREATED *event_data = &data->evt_created; @@ -6670,7 +6670,7 @@ short CustomObjectScript_0923::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0922::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0922::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { tOSIRISEVTCREATED *event_data = &data->evt_created; @@ -6708,7 +6708,7 @@ short CustomObjectScript_0922::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0921::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0921::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { tOSIRISEVTCREATED *event_data = &data->evt_created; @@ -6746,7 +6746,7 @@ short CustomObjectScript_0921::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_1120::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_1120::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { tOSIRISEVTCREATED *event_data = &data->evt_created; @@ -6784,7 +6784,7 @@ short CustomObjectScript_1120::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_111F::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_111F::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { tOSIRISEVTCREATED *event_data = &data->evt_created; @@ -6822,7 +6822,7 @@ short CustomObjectScript_111F::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_111E::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_111E::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { tOSIRISEVTCREATED *event_data = &data->evt_created; @@ -6860,7 +6860,7 @@ short CustomObjectScript_111E::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_112E::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_112E::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_INTERVAL: { tOSIRISEVTINTERVAL *event_data = &data->evt_interval; @@ -6907,7 +6907,7 @@ short CustomObjectScript_112E::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0932::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0932::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -6943,7 +6943,7 @@ short CustomObjectScript_0932::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0931::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0931::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -6977,7 +6977,7 @@ short CustomObjectScript_0931::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_080F::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_080F::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -7003,7 +7003,7 @@ short CustomObjectScript_080F::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0967::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0967::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -7048,7 +7048,7 @@ short CustomObjectScript_0967::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0966::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0966::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -7096,7 +7096,7 @@ short CustomObjectScript_0966::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0809::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0809::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -7116,7 +7116,7 @@ short CustomObjectScript_0809::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_000B::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_000B::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -7135,7 +7135,7 @@ short TriggerScript_000B::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_000A::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_000A::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -7154,7 +7154,7 @@ short TriggerScript_000A::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0007::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0007::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -7173,7 +7173,7 @@ short TriggerScript_0007::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0006::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0006::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -7192,7 +7192,7 @@ short TriggerScript_0006::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0004::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0004::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -7211,7 +7211,7 @@ short TriggerScript_0004::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0003::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0003::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -7230,7 +7230,7 @@ short TriggerScript_0003::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0001::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0001::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -7249,7 +7249,7 @@ short TriggerScript_0001::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_000D::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_000D::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -7277,7 +7277,7 @@ short TriggerScript_000D::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_000C::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_000C::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -7305,7 +7305,7 @@ short TriggerScript_000C::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0009::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0009::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -7333,7 +7333,7 @@ short TriggerScript_0009::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0008::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0008::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -7361,7 +7361,7 @@ short TriggerScript_0008::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0005::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0005::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -7389,7 +7389,7 @@ short TriggerScript_0005::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0002::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0002::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -7408,7 +7408,7 @@ short TriggerScript_0002::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -7427,7 +7427,7 @@ short TriggerScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0013::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0013::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -7450,7 +7450,7 @@ short TriggerScript_0013::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0012::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0012::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -7471,7 +7471,7 @@ short TriggerScript_0012::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_000F::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_000F::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -7491,7 +7491,7 @@ short TriggerScript_000F::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_000E::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_000E::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -7511,7 +7511,7 @@ short TriggerScript_000E::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0011::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0011::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -7532,7 +7532,7 @@ short TriggerScript_0011::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0010::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0010::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -7553,7 +7553,7 @@ short TriggerScript_0010::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0014::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0014::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -7571,7 +7571,7 @@ short TriggerScript_0014::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0015::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0015::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; diff --git a/scripts/Merc3.cpp b/scripts/Merc3.cpp index 7b42e33d..c8415453 100644 --- a/scripts/Merc3.cpp +++ b/scripts/Merc3.cpp @@ -40,7 +40,7 @@ DLLEXPORT void STDCALL ShutdownDLL(void); DLLEXPORT int STDCALL GetGOScriptID(const char *name, uint8_t is_door); DLLEXPORT void STDCALLPTR CreateInstance(int id); DLLEXPORT void STDCALL DestroyInstance(int id, void *ptr); -DLLEXPORT short STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data); +DLLEXPORT int16_t STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data); DLLEXPORT int STDCALL GetTriggerScriptID(int trigger_room, int trigger_face); DLLEXPORT int STDCALL GetCOScriptList(int **list, int **id_list); DLLEXPORT int STDCALL SaveRestoreState(void *file_ptr, uint8_t saving_state); @@ -176,577 +176,577 @@ class BaseScript { public: BaseScript(); ~BaseScript(); - virtual short CallEvent(int event, tOSIRISEventInfo *data); + virtual int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class LevelScript_0000 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0B83 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0B85 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_1140 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_1941 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0943 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0942 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0950 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0951 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_093A : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_193D : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_093B : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_192E : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_093C : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_1318 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_1317 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_190B : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_6909 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_191C : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_111D : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_110F : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_1194 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_11FA : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0CB4 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_20B0 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_136F : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_3090 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_30AE : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_50FF : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0987 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0989 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_10FA : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_18FB : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_10FC : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_10F9 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_10F8 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_D08A : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_2888 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_09FD : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_48C5 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_09FC : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_08D6 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_09FB : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_08DF : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_105C : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_08E8 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_60EB : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_28EC : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_118B : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_118D : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_118C : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_098E : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_11F7 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0983 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_1BB9 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_13AD : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_13AC : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_13AB : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_13AA : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0A2E : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0A30 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0A33 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0982 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_12DF : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_12E1 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_12DE : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_1289 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_1290 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_128E : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_128C : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_128A : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_18A0 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_083D : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0B86 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0B80 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0B82 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_109F : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_1153 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_115E : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_095F : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0960 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0961 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0012 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0022 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0011 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0023 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0000 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0021 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0010 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0002 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_001E : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0003 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0004 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0005 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0006 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0007 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0008 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_001F : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0020 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0025 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0024 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_000C : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_001D : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_000D : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_000E : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_000F : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0014 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0017 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0016 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0018 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_001C : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0019 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_001A : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_001B : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; // ====================== @@ -1638,7 +1638,7 @@ void RestoreGlobalActionCtrs(void *file_ptr) { #define G_ANTI 2 typedef struct t_animation_data { - short first, last; + int16_t first, last; } t_animation_data; const t_animation_data Gravity_state_xlates[3][3] = { @@ -2036,7 +2036,7 @@ bool qBeamHittingPlayer2(int beam1_handle, int beam2_handle, float radius) { // * = spark typedef struct t_exit_room_node { - short room_number; + int16_t room_number; const char *commands; char cmdstr[16]; } t_exit_room_node; @@ -3782,7 +3782,7 @@ void STDCALL DestroyInstance(int id, void *ptr) { // =================== // CallInstanceEvent() // =================== -short STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data) { +int16_t STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data) { switch (id) { case ID_LEVEL_0000: case ID_CUSTOM_OBJECT_0B83: @@ -4136,12 +4136,12 @@ BaseScript::BaseScript() {} BaseScript::~BaseScript() {} -short BaseScript::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t BaseScript::CallEvent(int event, tOSIRISEventInfo *data) { mprintf(0, "BaseScript::CallEvent()\n"); return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_SAVESTATE: { tOSIRISEVTSAVESTATE *event_data = &data->evt_savestate; @@ -5943,7 +5943,7 @@ short LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0B83::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0B83::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_AIN_MOVIE_END: { tOSIRISEVTAINOTIFY *event_data = &data->evt_ain_movie_end; @@ -5969,7 +5969,7 @@ short CustomObjectScript_0B83::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0B85::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0B85::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_AIN_MOVIE_END: { tOSIRISEVTAINOTIFY *event_data = &data->evt_ain_movie_end; @@ -5993,7 +5993,7 @@ short CustomObjectScript_0B85::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_1140::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_1140::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -6013,7 +6013,7 @@ short CustomObjectScript_1140::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_1941::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_1941::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -6054,7 +6054,7 @@ short CustomObjectScript_1941::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0943::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0943::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -6094,7 +6094,7 @@ short CustomObjectScript_0943::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0942::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0942::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -6125,7 +6125,7 @@ short CustomObjectScript_0942::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0950::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0950::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -6144,7 +6144,7 @@ short CustomObjectScript_0950::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0951::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0951::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -6185,7 +6185,7 @@ short CustomObjectScript_0951::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_093A::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_093A::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -6225,7 +6225,7 @@ short CustomObjectScript_093A::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_193D::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_193D::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -6256,7 +6256,7 @@ short CustomObjectScript_193D::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_093B::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_093B::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -6281,7 +6281,7 @@ short CustomObjectScript_093B::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_192E::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_192E::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -6301,7 +6301,7 @@ short CustomObjectScript_192E::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_093C::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_093C::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -6346,7 +6346,7 @@ short CustomObjectScript_093C::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_1318::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_1318::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -6368,7 +6368,7 @@ short CustomObjectScript_1318::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_1317::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_1317::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -6402,7 +6402,7 @@ short CustomObjectScript_1317::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_190B::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_190B::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -6436,7 +6436,7 @@ short CustomObjectScript_190B::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_6909::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_6909::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -6470,7 +6470,7 @@ short CustomObjectScript_6909::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_191C::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_191C::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -6489,7 +6489,7 @@ short CustomObjectScript_191C::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_111D::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_111D::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -6508,7 +6508,7 @@ short CustomObjectScript_111D::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_110F::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_110F::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -6537,7 +6537,7 @@ short CustomObjectScript_110F::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_1194::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_1194::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_DESTROY: { tOSIRISEVTDESTROY *event_data = &data->evt_destroy; @@ -6562,7 +6562,7 @@ short CustomObjectScript_1194::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_11FA::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_11FA::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_DESTROY: { tOSIRISEVTDESTROY *event_data = &data->evt_destroy; @@ -6587,7 +6587,7 @@ short CustomObjectScript_11FA::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0CB4::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0CB4::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -6697,7 +6697,7 @@ short CustomObjectScript_0CB4::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_20B0::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_20B0::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -6720,7 +6720,7 @@ short CustomObjectScript_20B0::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_136F::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_136F::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -6743,7 +6743,7 @@ short CustomObjectScript_136F::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_3090::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_3090::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -6766,7 +6766,7 @@ short CustomObjectScript_3090::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_30AE::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_30AE::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -6789,7 +6789,7 @@ short CustomObjectScript_30AE::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_50FF::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_50FF::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -6839,7 +6839,7 @@ short CustomObjectScript_50FF::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0987::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0987::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_AIN_MOVIE_END: { tOSIRISEVTAINOTIFY *event_data = &data->evt_ain_movie_end; @@ -6870,7 +6870,7 @@ short CustomObjectScript_0987::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0989::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0989::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_AIN_MOVIE_END: { tOSIRISEVTAINOTIFY *event_data = &data->evt_ain_movie_end; @@ -6902,7 +6902,7 @@ short CustomObjectScript_0989::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_10FA::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_10FA::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -6930,7 +6930,7 @@ short CustomObjectScript_10FA::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_18FB::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_18FB::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -6954,7 +6954,7 @@ short CustomObjectScript_18FB::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_10FC::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_10FC::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -6982,7 +6982,7 @@ short CustomObjectScript_10FC::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_10F9::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_10F9::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -7011,7 +7011,7 @@ short CustomObjectScript_10F9::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_10F8::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_10F8::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -7035,7 +7035,7 @@ short CustomObjectScript_10F8::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_D08A::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_D08A::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -7064,7 +7064,7 @@ short CustomObjectScript_D08A::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_2888::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_2888::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -7091,7 +7091,7 @@ short CustomObjectScript_2888::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_09FD::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_09FD::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_AIN_SEEPLAYER: { tOSIRISEVTAINOTIFY *event_data = &data->evt_ain_seeplayer; @@ -7112,7 +7112,7 @@ short CustomObjectScript_09FD::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_48C5::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_48C5::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -7136,7 +7136,7 @@ short CustomObjectScript_48C5::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_09FC::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_09FC::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_AIN_SEEPLAYER: { tOSIRISEVTAINOTIFY *event_data = &data->evt_ain_seeplayer; @@ -7157,7 +7157,7 @@ short CustomObjectScript_09FC::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_08D6::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_08D6::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -7181,7 +7181,7 @@ short CustomObjectScript_08D6::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_09FB::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_09FB::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_AIN_SEEPLAYER: { tOSIRISEVTAINOTIFY *event_data = &data->evt_ain_seeplayer; @@ -7202,7 +7202,7 @@ short CustomObjectScript_09FB::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_08DF::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_08DF::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -7226,7 +7226,7 @@ short CustomObjectScript_08DF::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_105C::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_105C::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_AIN_SEEPLAYER: { tOSIRISEVTAINOTIFY *event_data = &data->evt_ain_seeplayer; @@ -7247,7 +7247,7 @@ short CustomObjectScript_105C::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_08E8::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_08E8::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -7271,7 +7271,7 @@ short CustomObjectScript_08E8::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_60EB::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_60EB::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_DESTROY: { tOSIRISEVTDESTROY *event_data = &data->evt_destroy; @@ -7299,7 +7299,7 @@ short CustomObjectScript_60EB::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_28EC::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_28EC::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_DESTROY: { tOSIRISEVTDESTROY *event_data = &data->evt_destroy; @@ -7327,7 +7327,7 @@ short CustomObjectScript_28EC::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_118B::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_118B::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -7346,7 +7346,7 @@ short CustomObjectScript_118B::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_118D::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_118D::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -7365,7 +7365,7 @@ short CustomObjectScript_118D::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_118C::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_118C::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -7383,7 +7383,7 @@ short CustomObjectScript_118C::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_098E::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_098E::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -7401,7 +7401,7 @@ short CustomObjectScript_098E::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_11F7::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_11F7::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -7463,7 +7463,7 @@ short CustomObjectScript_11F7::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0983::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0983::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_DESTROY: { tOSIRISEVTDESTROY *event_data = &data->evt_destroy; @@ -7523,7 +7523,7 @@ short CustomObjectScript_0983::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_1BB9::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_1BB9::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -7546,7 +7546,7 @@ short CustomObjectScript_1BB9::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_13AD::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_13AD::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -7613,7 +7613,7 @@ short CustomObjectScript_13AD::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_13AC::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_13AC::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -7635,7 +7635,7 @@ short CustomObjectScript_13AC::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_13AB::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_13AB::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -7660,7 +7660,7 @@ short CustomObjectScript_13AB::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_13AA::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_13AA::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -7680,7 +7680,7 @@ short CustomObjectScript_13AA::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0A2E::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0A2E::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_AIN_MOVIE_END: { tOSIRISEVTAINOTIFY *event_data = &data->evt_ain_movie_end; @@ -7708,7 +7708,7 @@ short CustomObjectScript_0A2E::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0A30::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0A30::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_AIN_MOVIE_END: { tOSIRISEVTAINOTIFY *event_data = &data->evt_ain_movie_end; @@ -7752,7 +7752,7 @@ short CustomObjectScript_0A30::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0A33::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0A33::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -7815,7 +7815,7 @@ short CustomObjectScript_0A33::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0982::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0982::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_DESTROY: { tOSIRISEVTDESTROY *event_data = &data->evt_destroy; @@ -7857,7 +7857,7 @@ short CustomObjectScript_0982::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_12DF::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_12DF::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -7887,7 +7887,7 @@ short CustomObjectScript_12DF::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_12E1::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_12E1::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -7930,7 +7930,7 @@ short CustomObjectScript_12E1::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_12DE::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_12DE::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -7990,7 +7990,7 @@ short CustomObjectScript_12DE::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_1289::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_1289::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_DESTROY: { tOSIRISEVTDESTROY *event_data = &data->evt_destroy; @@ -8033,7 +8033,7 @@ short CustomObjectScript_1289::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_1290::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_1290::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_DESTROY: { tOSIRISEVTDESTROY *event_data = &data->evt_destroy; @@ -8076,7 +8076,7 @@ short CustomObjectScript_1290::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_128E::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_128E::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_DESTROY: { tOSIRISEVTDESTROY *event_data = &data->evt_destroy; @@ -8119,7 +8119,7 @@ short CustomObjectScript_128E::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_128C::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_128C::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_DESTROY: { tOSIRISEVTDESTROY *event_data = &data->evt_destroy; @@ -8162,7 +8162,7 @@ short CustomObjectScript_128C::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_128A::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_128A::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_DESTROY: { tOSIRISEVTDESTROY *event_data = &data->evt_destroy; @@ -8205,7 +8205,7 @@ short CustomObjectScript_128A::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_18A0::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_18A0::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -8230,7 +8230,7 @@ short CustomObjectScript_18A0::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_083D::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_083D::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -8255,7 +8255,7 @@ short CustomObjectScript_083D::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0B86::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0B86::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_AIN_MOVIE_END: { tOSIRISEVTAINOTIFY *event_data = &data->evt_ain_movie_end; @@ -8281,7 +8281,7 @@ short CustomObjectScript_0B86::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0B80::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0B80::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_AIN_MOVIE_END: { tOSIRISEVTAINOTIFY *event_data = &data->evt_ain_movie_end; @@ -8306,7 +8306,7 @@ short CustomObjectScript_0B80::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0B82::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0B82::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_AIN_MOVIE_END: { tOSIRISEVTAINOTIFY *event_data = &data->evt_ain_movie_end; @@ -8326,7 +8326,7 @@ short CustomObjectScript_0B82::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_109F::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_109F::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -8349,7 +8349,7 @@ short CustomObjectScript_109F::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_1153::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_1153::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_AIN_MOVIE_END: { tOSIRISEVTAINOTIFY *event_data = &data->evt_ain_movie_end; @@ -8367,7 +8367,7 @@ short CustomObjectScript_1153::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_115E::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_115E::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -8385,7 +8385,7 @@ short CustomObjectScript_115E::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_095F::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_095F::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -8403,7 +8403,7 @@ short CustomObjectScript_095F::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0960::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0960::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -8421,7 +8421,7 @@ short CustomObjectScript_0960::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0961::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0961::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -8439,7 +8439,7 @@ short CustomObjectScript_0961::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0012::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0012::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -8457,7 +8457,7 @@ short TriggerScript_0012::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0022::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0022::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -8479,7 +8479,7 @@ short TriggerScript_0022::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0011::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0011::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -8497,7 +8497,7 @@ short TriggerScript_0011::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0023::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0023::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -8516,7 +8516,7 @@ short TriggerScript_0023::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -8534,7 +8534,7 @@ short TriggerScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0021::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0021::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -8555,7 +8555,7 @@ short TriggerScript_0021::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0010::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0010::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -8575,7 +8575,7 @@ short TriggerScript_0010::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0002::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0002::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -8608,7 +8608,7 @@ short TriggerScript_0002::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_001E::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_001E::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -8626,7 +8626,7 @@ short TriggerScript_001E::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0003::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0003::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -8644,7 +8644,7 @@ short TriggerScript_0003::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0004::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0004::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -8662,7 +8662,7 @@ short TriggerScript_0004::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0005::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0005::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -8680,7 +8680,7 @@ short TriggerScript_0005::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0006::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0006::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -8698,7 +8698,7 @@ short TriggerScript_0006::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0007::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0007::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -8723,7 +8723,7 @@ short TriggerScript_0007::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0008::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0008::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -8746,7 +8746,7 @@ short TriggerScript_0008::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_001F::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_001F::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -8766,7 +8766,7 @@ short TriggerScript_001F::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0020::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0020::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -8786,7 +8786,7 @@ short TriggerScript_0020::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0025::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0025::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -8804,7 +8804,7 @@ short TriggerScript_0025::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0024::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0024::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -8822,7 +8822,7 @@ short TriggerScript_0024::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_000C::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_000C::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -8881,7 +8881,7 @@ short TriggerScript_000C::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_001D::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_001D::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -8902,7 +8902,7 @@ short TriggerScript_001D::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_000D::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_000D::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -8923,7 +8923,7 @@ short TriggerScript_000D::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_000E::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_000E::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -8961,7 +8961,7 @@ short TriggerScript_000E::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_000F::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_000F::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -9004,7 +9004,7 @@ short TriggerScript_000F::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0014::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0014::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -9027,7 +9027,7 @@ short TriggerScript_0014::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0017::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0017::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -9045,7 +9045,7 @@ short TriggerScript_0017::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0016::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0016::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -9063,7 +9063,7 @@ short TriggerScript_0016::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0018::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0018::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -9081,7 +9081,7 @@ short TriggerScript_0018::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_001C::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_001C::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -9099,7 +9099,7 @@ short TriggerScript_001C::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0019::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0019::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -9117,7 +9117,7 @@ short TriggerScript_0019::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_001A::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_001A::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -9135,7 +9135,7 @@ short TriggerScript_001A::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_001B::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_001B::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; diff --git a/scripts/Merc4.cpp b/scripts/Merc4.cpp index d8065f1a..9c0e582c 100644 --- a/scripts/Merc4.cpp +++ b/scripts/Merc4.cpp @@ -40,7 +40,7 @@ DLLEXPORT void STDCALL ShutdownDLL(void); DLLEXPORT int STDCALL GetGOScriptID(const char *name, uint8_t is_door); DLLEXPORT void STDCALLPTR CreateInstance(int id); DLLEXPORT void STDCALL DestroyInstance(int id, void *ptr); -DLLEXPORT short STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data); +DLLEXPORT int16_t STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data); DLLEXPORT int STDCALL GetTriggerScriptID(int trigger_room, int trigger_face); DLLEXPORT int STDCALL GetCOScriptList(int **list, int **id_list); DLLEXPORT int STDCALL SaveRestoreState(void *file_ptr, uint8_t saving_state); @@ -100,197 +100,197 @@ class BaseScript { public: BaseScript(); ~BaseScript(); - virtual short CallEvent(int event, tOSIRISEventInfo *data); + virtual int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class LevelScript_0000 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0811 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0804 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0803 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_3198 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_099A : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_099E : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_09A0 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_080A : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_09AC : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_1138 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_11B2 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_31B7 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_11D1 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_09D2 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0003 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0010 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0011 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0013 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0014 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0012 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0015 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0016 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0004 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0005 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0006 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0007 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0002 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0000 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0001 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_000D : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_000E : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0008 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_000F : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0009 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_000A : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_000B : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_000C : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; // ====================== @@ -1681,7 +1681,7 @@ void STDCALL DestroyInstance(int id, void *ptr) { // =================== // CallInstanceEvent() // =================== -short STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data) { +int16_t STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data) { switch (id) { case ID_LEVEL_0000: case ID_CUSTOM_OBJECT_0811: @@ -1851,12 +1851,12 @@ BaseScript::BaseScript() {} BaseScript::~BaseScript() {} -short BaseScript::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t BaseScript::CallEvent(int event, tOSIRISEventInfo *data) { mprintf(0, "BaseScript::CallEvent()\n"); return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_SAVESTATE: { tOSIRISEVTSAVESTATE *event_data = &data->evt_savestate; @@ -2533,7 +2533,7 @@ short LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0811::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0811::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -2555,7 +2555,7 @@ short CustomObjectScript_0811::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0804::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0804::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -2602,7 +2602,7 @@ short CustomObjectScript_0804::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0803::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0803::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -2648,7 +2648,7 @@ short CustomObjectScript_0803::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_3198::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_3198::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -2701,7 +2701,7 @@ short CustomObjectScript_3198::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_099A::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_099A::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -2754,7 +2754,7 @@ short CustomObjectScript_099A::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_099E::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_099E::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -2776,7 +2776,7 @@ short CustomObjectScript_099E::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_09A0::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_09A0::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -2797,7 +2797,7 @@ short CustomObjectScript_09A0::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_080A::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_080A::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -2822,7 +2822,7 @@ short CustomObjectScript_080A::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_09AC::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_09AC::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -2869,7 +2869,7 @@ short CustomObjectScript_09AC::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_1138::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_1138::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -2932,7 +2932,7 @@ short CustomObjectScript_1138::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_11B2::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_11B2::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_DESTROY: { tOSIRISEVTDESTROY *event_data = &data->evt_destroy; @@ -2975,7 +2975,7 @@ short CustomObjectScript_11B2::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_31B7::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_31B7::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -2994,7 +2994,7 @@ short CustomObjectScript_31B7::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_11D1::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_11D1::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3014,7 +3014,7 @@ short CustomObjectScript_11D1::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_09D2::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_09D2::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3034,7 +3034,7 @@ short CustomObjectScript_09D2::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0003::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0003::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3053,7 +3053,7 @@ short TriggerScript_0003::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0010::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0010::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3071,7 +3071,7 @@ short TriggerScript_0010::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0011::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0011::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3089,7 +3089,7 @@ short TriggerScript_0011::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0013::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0013::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3107,7 +3107,7 @@ short TriggerScript_0013::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0014::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0014::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3125,7 +3125,7 @@ short TriggerScript_0014::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0012::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0012::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3143,7 +3143,7 @@ short TriggerScript_0012::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0015::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0015::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3161,7 +3161,7 @@ short TriggerScript_0015::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0016::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0016::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3179,7 +3179,7 @@ short TriggerScript_0016::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0004::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0004::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3200,7 +3200,7 @@ short TriggerScript_0004::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0005::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0005::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3218,7 +3218,7 @@ short TriggerScript_0005::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0006::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0006::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3236,7 +3236,7 @@ short TriggerScript_0006::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0007::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0007::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3254,7 +3254,7 @@ short TriggerScript_0007::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0002::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0002::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3281,7 +3281,7 @@ short TriggerScript_0002::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3299,7 +3299,7 @@ short TriggerScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0001::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0001::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3317,7 +3317,7 @@ short TriggerScript_0001::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_000D::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_000D::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3336,7 +3336,7 @@ short TriggerScript_000D::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_000E::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_000E::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3356,7 +3356,7 @@ short TriggerScript_000E::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0008::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0008::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3376,7 +3376,7 @@ short TriggerScript_0008::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_000F::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_000F::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3394,7 +3394,7 @@ short TriggerScript_000F::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0009::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0009::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3412,7 +3412,7 @@ short TriggerScript_0009::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_000A::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_000A::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3430,7 +3430,7 @@ short TriggerScript_000A::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_000B::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_000B::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3448,7 +3448,7 @@ short TriggerScript_000B::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_000C::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_000C::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; diff --git a/scripts/Merc6.cpp b/scripts/Merc6.cpp index c651ff85..3653fb88 100644 --- a/scripts/Merc6.cpp +++ b/scripts/Merc6.cpp @@ -40,7 +40,7 @@ DLLEXPORT void STDCALL ShutdownDLL(void); DLLEXPORT int STDCALL GetGOScriptID(const char *name, uint8_t is_door); DLLEXPORT void STDCALLPTR CreateInstance(int id); DLLEXPORT void STDCALL DestroyInstance(int id, void *ptr); -DLLEXPORT short STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data); +DLLEXPORT int16_t STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data); DLLEXPORT int STDCALL GetTriggerScriptID(int trigger_room, int trigger_face); DLLEXPORT int STDCALL GetCOScriptList(int **list, int **id_list); DLLEXPORT int STDCALL SaveRestoreState(void *file_ptr, uint8_t saving_state); @@ -111,252 +111,252 @@ class BaseScript { public: BaseScript(); ~BaseScript(); - virtual short CallEvent(int event, tOSIRISEventInfo *data); + virtual int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class LevelScript_0000 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_1006 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0841 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0840 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0864 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_186D : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_20A3 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_08A5 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_08A6 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_08A7 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_403E : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_783F : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_1084 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0885 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_1086 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_2046 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_08A8 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_08A9 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_08B9 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_5847 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_1048 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_104A : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_108E : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_1827 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_001A : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0007 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0000 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0001 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0002 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0003 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0004 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0005 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0006 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0008 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0009 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_000A : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_000B : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_000C : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_000D : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_000E : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_000F : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0010 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0011 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0018 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0019 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0014 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0015 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0016 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0017 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; // ====================== @@ -1728,7 +1728,7 @@ void STDCALL DestroyInstance(int id, void *ptr) { // =================== // CallInstanceEvent() // =================== -short STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data) { +int16_t STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data) { switch (id) { case ID_LEVEL_0000: case ID_CUSTOM_OBJECT_1006: @@ -1926,12 +1926,12 @@ BaseScript::BaseScript() {} BaseScript::~BaseScript() {} -short BaseScript::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t BaseScript::CallEvent(int event, tOSIRISEventInfo *data) { mprintf(0, "BaseScript::CallEvent()\n"); return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_SAVESTATE: { tOSIRISEVTSAVESTATE *event_data = &data->evt_savestate; @@ -2731,7 +2731,7 @@ short LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_1006::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_1006::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -2751,7 +2751,7 @@ short CustomObjectScript_1006::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0841::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0841::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_DESTROY: { tOSIRISEVTDESTROY *event_data = &data->evt_destroy; @@ -2777,7 +2777,7 @@ short CustomObjectScript_0841::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0840::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0840::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_DESTROY: { tOSIRISEVTDESTROY *event_data = &data->evt_destroy; @@ -2803,7 +2803,7 @@ short CustomObjectScript_0840::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0864::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0864::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_DESTROY: { tOSIRISEVTDESTROY *event_data = &data->evt_destroy; @@ -2829,7 +2829,7 @@ short CustomObjectScript_0864::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_186D::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_186D::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_DESTROY: { tOSIRISEVTDESTROY *event_data = &data->evt_destroy; @@ -2855,7 +2855,7 @@ short CustomObjectScript_186D::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_20A3::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_20A3::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -2877,7 +2877,7 @@ short CustomObjectScript_20A3::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_08A5::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_08A5::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -2899,7 +2899,7 @@ short CustomObjectScript_08A5::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_08A6::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_08A6::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -2921,7 +2921,7 @@ short CustomObjectScript_08A6::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_08A7::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_08A7::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -2943,7 +2943,7 @@ short CustomObjectScript_08A7::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_403E::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_403E::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -2965,7 +2965,7 @@ short CustomObjectScript_403E::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_783F::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_783F::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3000,7 +3000,7 @@ short CustomObjectScript_783F::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_1084::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_1084::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_DAMAGED: { tOSIRISEVTDAMAGED *event_data = &data->evt_damaged; @@ -3041,7 +3041,7 @@ short CustomObjectScript_1084::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0885::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0885::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_DAMAGED: { tOSIRISEVTDAMAGED *event_data = &data->evt_damaged; @@ -3082,7 +3082,7 @@ short CustomObjectScript_0885::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_1086::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_1086::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_DAMAGED: { tOSIRISEVTDAMAGED *event_data = &data->evt_damaged; @@ -3123,7 +3123,7 @@ short CustomObjectScript_1086::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_2046::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_2046::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_DESTROY: { tOSIRISEVTDESTROY *event_data = &data->evt_destroy; @@ -3145,7 +3145,7 @@ short CustomObjectScript_2046::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_08A8::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_08A8::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_DESTROY: { tOSIRISEVTDESTROY *event_data = &data->evt_destroy; @@ -3167,7 +3167,7 @@ short CustomObjectScript_08A8::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_08A9::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_08A9::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_DESTROY: { tOSIRISEVTDESTROY *event_data = &data->evt_destroy; @@ -3189,7 +3189,7 @@ short CustomObjectScript_08A9::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_08B9::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_08B9::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3222,7 +3222,7 @@ short CustomObjectScript_08B9::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_5847::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_5847::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3261,7 +3261,7 @@ short CustomObjectScript_5847::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_1048::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_1048::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3315,7 +3315,7 @@ short CustomObjectScript_1048::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_104A::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_104A::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3356,7 +3356,7 @@ short CustomObjectScript_104A::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_108E::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_108E::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3378,7 +3378,7 @@ short CustomObjectScript_108E::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_1827::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_1827::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3412,7 +3412,7 @@ short CustomObjectScript_1827::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_001A::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_001A::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3431,7 +3431,7 @@ short TriggerScript_001A::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0007::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0007::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3449,7 +3449,7 @@ short TriggerScript_0007::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3467,7 +3467,7 @@ short TriggerScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0001::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0001::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3485,7 +3485,7 @@ short TriggerScript_0001::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0002::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0002::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3503,7 +3503,7 @@ short TriggerScript_0002::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0003::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0003::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3521,7 +3521,7 @@ short TriggerScript_0003::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0004::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0004::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3539,7 +3539,7 @@ short TriggerScript_0004::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0005::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0005::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3557,7 +3557,7 @@ short TriggerScript_0005::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0006::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0006::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3575,7 +3575,7 @@ short TriggerScript_0006::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0008::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0008::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3593,7 +3593,7 @@ short TriggerScript_0008::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0009::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0009::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3611,7 +3611,7 @@ short TriggerScript_0009::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_000A::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_000A::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3629,7 +3629,7 @@ short TriggerScript_000A::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_000B::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_000B::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3647,7 +3647,7 @@ short TriggerScript_000B::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_000C::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_000C::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3665,7 +3665,7 @@ short TriggerScript_000C::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_000D::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_000D::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3683,7 +3683,7 @@ short TriggerScript_000D::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_000E::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_000E::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3701,7 +3701,7 @@ short TriggerScript_000E::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_000F::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_000F::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3719,7 +3719,7 @@ short TriggerScript_000F::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0010::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0010::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3737,7 +3737,7 @@ short TriggerScript_0010::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0011::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0011::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3755,7 +3755,7 @@ short TriggerScript_0011::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0018::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0018::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3786,7 +3786,7 @@ short TriggerScript_0018::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0019::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0019::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3817,7 +3817,7 @@ short TriggerScript_0019::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0014::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0014::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3839,7 +3839,7 @@ short TriggerScript_0014::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0015::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0015::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3861,7 +3861,7 @@ short TriggerScript_0015::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0016::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0016::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3883,7 +3883,7 @@ short TriggerScript_0016::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0017::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0017::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; diff --git a/scripts/Merc7.cpp b/scripts/Merc7.cpp index 0e950d8e..a4eb6fc8 100644 --- a/scripts/Merc7.cpp +++ b/scripts/Merc7.cpp @@ -40,7 +40,7 @@ DLLEXPORT void STDCALL ShutdownDLL(void); DLLEXPORT int STDCALL GetGOScriptID(const char *name, uint8_t is_door); DLLEXPORT void STDCALLPTR CreateInstance(int id); DLLEXPORT void STDCALL DestroyInstance(int id, void *ptr); -DLLEXPORT short STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data); +DLLEXPORT int16_t STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data); DLLEXPORT int STDCALL GetTriggerScriptID(int trigger_room, int trigger_face); DLLEXPORT int STDCALL GetCOScriptList(int **list, int **id_list); DLLEXPORT int STDCALL SaveRestoreState(void *file_ptr, uint8_t saving_state); @@ -146,427 +146,427 @@ class BaseScript { public: BaseScript(); ~BaseScript(); - virtual short CallEvent(int event, tOSIRISEventInfo *data); + virtual int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class LevelScript_0000 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0885 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0884 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0903 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0902 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0901 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_1025 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_103B : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_1038 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_2022 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_10AF : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_20AA : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_1031 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0833 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0951 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0952 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0953 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0954 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_095F : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0960 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0961 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0962 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0869 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0963 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0964 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0965 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0966 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0995 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0994 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0993 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0992 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_1191 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_083D : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_103C : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_103E : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0841 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_097A : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0997 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0996 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0805 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0804 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0998 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_087E : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_1834 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_1877 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_1078 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_1070 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_2075 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_2076 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_2863 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_207A : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_206D : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_1079 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_09BF : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_09BE : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_09BD : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_09BC : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_1071 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_09CA : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_09C9 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_09C8 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_09C7 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_09C6 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_09C5 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_09C4 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_09C3 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_09C2 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_286E : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0005 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0000 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0006 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0004 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0008 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0009 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_000F : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0013 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0012 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0011 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0010 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_000E : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_000C : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_000D : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_000A : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_000B : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; // ====================== @@ -1191,8 +1191,8 @@ $$END static uint8_t ff_index = 0; static struct t_ff_enable_data { - short room_number; - short portal_num; + int16_t room_number; + int16_t portal_num; bool state; bool double_sided; } ff_enable_data[8]; @@ -1355,7 +1355,7 @@ static int DC_Valid_Matcen_Handles[DC_N_VALID_MATCENS]; static unsigned DC_Matcen_Mask = 0; // used to exclude slots to prevent conflicts static int DC_EQR = -5; // droid equilibrium register. - // if < 0, that's how many droids we're short + // if < 0, that's how many droids we're int16_t // if > 0, this means we must tell some droids to leave! void DCDetermineObjFate(int objhandle, bool new_droid); @@ -3048,7 +3048,7 @@ void STDCALL DestroyInstance(int id, void *ptr) { // =================== // CallInstanceEvent() // =================== -short STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data) { +int16_t STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data) { switch (id) { case ID_LEVEL_0000: case ID_CUSTOM_OBJECT_0885: @@ -3307,12 +3307,12 @@ BaseScript::BaseScript() {} BaseScript::~BaseScript() {} -short BaseScript::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t BaseScript::CallEvent(int event, tOSIRISEventInfo *data) { mprintf(0, "BaseScript::CallEvent()\n"); return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_SAVESTATE: { tOSIRISEVTSAVESTATE *event_data = &data->evt_savestate; @@ -3880,7 +3880,7 @@ short LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0885::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0885::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_AIN_MOVIE_END: { tOSIRISEVTAINOTIFY *event_data = &data->evt_ain_movie_end; @@ -3898,7 +3898,7 @@ short CustomObjectScript_0885::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0884::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0884::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_AIN_MOVIE_END: { tOSIRISEVTAINOTIFY *event_data = &data->evt_ain_movie_end; @@ -3920,7 +3920,7 @@ short CustomObjectScript_0884::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0903::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0903::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_DESTROY: { tOSIRISEVTDESTROY *event_data = &data->evt_destroy; @@ -3945,7 +3945,7 @@ short CustomObjectScript_0903::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0902::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0902::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_DESTROY: { tOSIRISEVTDESTROY *event_data = &data->evt_destroy; @@ -3970,7 +3970,7 @@ short CustomObjectScript_0902::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0901::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0901::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_DESTROY: { tOSIRISEVTDESTROY *event_data = &data->evt_destroy; @@ -3995,7 +3995,7 @@ short CustomObjectScript_0901::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_1025::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_1025::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_DESTROY: { tOSIRISEVTDESTROY *event_data = &data->evt_destroy; @@ -4020,7 +4020,7 @@ short CustomObjectScript_1025::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_103B::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_103B::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_DESTROY: { tOSIRISEVTDESTROY *event_data = &data->evt_destroy; @@ -4045,7 +4045,7 @@ short CustomObjectScript_103B::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_1038::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_1038::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_DESTROY: { tOSIRISEVTDESTROY *event_data = &data->evt_destroy; @@ -4070,7 +4070,7 @@ short CustomObjectScript_1038::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_2022::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_2022::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_DESTROY: { tOSIRISEVTDESTROY *event_data = &data->evt_destroy; @@ -4095,7 +4095,7 @@ short CustomObjectScript_2022::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_10AF::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_10AF::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_DESTROY: { tOSIRISEVTDESTROY *event_data = &data->evt_destroy; @@ -4120,7 +4120,7 @@ short CustomObjectScript_10AF::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_20AA::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_20AA::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_DESTROY: { tOSIRISEVTDESTROY *event_data = &data->evt_destroy; @@ -4145,7 +4145,7 @@ short CustomObjectScript_20AA::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_1031::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_1031::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_DESTROY: { tOSIRISEVTDESTROY *event_data = &data->evt_destroy; @@ -4170,7 +4170,7 @@ short CustomObjectScript_1031::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0833::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0833::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -4193,7 +4193,7 @@ short CustomObjectScript_0833::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0951::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0951::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -4217,7 +4217,7 @@ short CustomObjectScript_0951::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0952::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0952::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -4242,7 +4242,7 @@ short CustomObjectScript_0952::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0953::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0953::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -4273,7 +4273,7 @@ short CustomObjectScript_0953::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0954::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0954::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -4292,7 +4292,7 @@ short CustomObjectScript_0954::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_095F::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_095F::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -4316,7 +4316,7 @@ short CustomObjectScript_095F::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0960::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0960::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -4341,7 +4341,7 @@ short CustomObjectScript_0960::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0961::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0961::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -4372,7 +4372,7 @@ short CustomObjectScript_0961::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0962::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0962::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -4391,7 +4391,7 @@ short CustomObjectScript_0962::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0869::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0869::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -4410,7 +4410,7 @@ short CustomObjectScript_0869::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0963::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0963::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -4434,7 +4434,7 @@ short CustomObjectScript_0963::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0964::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0964::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -4459,7 +4459,7 @@ short CustomObjectScript_0964::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0965::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0965::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -4490,7 +4490,7 @@ short CustomObjectScript_0965::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0966::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0966::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -4509,7 +4509,7 @@ short CustomObjectScript_0966::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0995::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0995::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -4537,7 +4537,7 @@ short CustomObjectScript_0995::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0994::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0994::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -4559,7 +4559,7 @@ short CustomObjectScript_0994::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0993::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0993::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -4581,7 +4581,7 @@ short CustomObjectScript_0993::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0992::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0992::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -4603,7 +4603,7 @@ short CustomObjectScript_0992::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_1191::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_1191::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -4625,7 +4625,7 @@ short CustomObjectScript_1191::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_083D::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_083D::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_DESTROY: { tOSIRISEVTDESTROY *event_data = &data->evt_destroy; @@ -4650,7 +4650,7 @@ short CustomObjectScript_083D::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_103C::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_103C::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_DESTROY: { tOSIRISEVTDESTROY *event_data = &data->evt_destroy; @@ -4675,7 +4675,7 @@ short CustomObjectScript_103C::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_103E::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_103E::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_DESTROY: { tOSIRISEVTDESTROY *event_data = &data->evt_destroy; @@ -4700,7 +4700,7 @@ short CustomObjectScript_103E::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0841::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0841::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_DESTROY: { tOSIRISEVTDESTROY *event_data = &data->evt_destroy; @@ -4725,7 +4725,7 @@ short CustomObjectScript_0841::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_097A::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_097A::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -4745,7 +4745,7 @@ short CustomObjectScript_097A::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0997::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0997::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -4808,7 +4808,7 @@ short CustomObjectScript_0997::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0996::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0996::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -4871,7 +4871,7 @@ short CustomObjectScript_0996::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0805::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0805::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -4897,7 +4897,7 @@ short CustomObjectScript_0805::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0804::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0804::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -4922,7 +4922,7 @@ short CustomObjectScript_0804::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0998::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0998::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_DESTROY: { tOSIRISEVTDESTROY *event_data = &data->evt_destroy; @@ -4995,7 +4995,7 @@ short CustomObjectScript_0998::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_087E::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_087E::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5042,7 +5042,7 @@ short CustomObjectScript_087E::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_1834::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_1834::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_DESTROY: { tOSIRISEVTDESTROY *event_data = &data->evt_destroy; @@ -5080,7 +5080,7 @@ short CustomObjectScript_1834::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_1877::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_1877::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_AIN_MOVIE_END: { tOSIRISEVTAINOTIFY *event_data = &data->evt_ain_movie_end; @@ -5099,7 +5099,7 @@ short CustomObjectScript_1877::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_1078::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_1078::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_AIN_MOVIE_END: { tOSIRISEVTAINOTIFY *event_data = &data->evt_ain_movie_end; @@ -5120,7 +5120,7 @@ short CustomObjectScript_1078::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_1070::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_1070::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_AIN_MOVIE_END: { tOSIRISEVTAINOTIFY *event_data = &data->evt_ain_movie_end; @@ -5150,7 +5150,7 @@ short CustomObjectScript_1070::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_2075::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_2075::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -5176,7 +5176,7 @@ short CustomObjectScript_2075::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_2076::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_2076::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -5203,7 +5203,7 @@ short CustomObjectScript_2076::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_2863::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_2863::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -5231,7 +5231,7 @@ short CustomObjectScript_2863::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_207A::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_207A::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -5255,7 +5255,7 @@ short CustomObjectScript_207A::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_206D::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_206D::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -5277,7 +5277,7 @@ short CustomObjectScript_206D::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_1079::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_1079::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_AIN_MOVIE_END: { tOSIRISEVTAINOTIFY *event_data = &data->evt_ain_movie_end; @@ -5304,7 +5304,7 @@ short CustomObjectScript_1079::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_09BF::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_09BF::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -5323,7 +5323,7 @@ short CustomObjectScript_09BF::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_09BE::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_09BE::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -5342,7 +5342,7 @@ short CustomObjectScript_09BE::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_09BD::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_09BD::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -5363,7 +5363,7 @@ short CustomObjectScript_09BD::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_09BC::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_09BC::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -5387,7 +5387,7 @@ short CustomObjectScript_09BC::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_1071::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_1071::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_AIN_MOVIE_END: { tOSIRISEVTAINOTIFY *event_data = &data->evt_ain_movie_end; @@ -5427,7 +5427,7 @@ short CustomObjectScript_1071::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_09CA::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_09CA::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -5452,7 +5452,7 @@ short CustomObjectScript_09CA::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_09C9::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_09C9::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -5477,7 +5477,7 @@ short CustomObjectScript_09C9::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_09C8::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_09C8::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -5498,7 +5498,7 @@ short CustomObjectScript_09C8::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_09C7::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_09C7::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -5525,7 +5525,7 @@ short CustomObjectScript_09C7::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_09C6::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_09C6::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -5546,7 +5546,7 @@ short CustomObjectScript_09C6::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_09C5::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_09C5::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -5572,7 +5572,7 @@ short CustomObjectScript_09C5::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_09C4::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_09C4::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -5593,7 +5593,7 @@ short CustomObjectScript_09C4::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_09C3::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_09C3::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -5614,7 +5614,7 @@ short CustomObjectScript_09C3::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_09C2::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_09C2::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -5635,7 +5635,7 @@ short CustomObjectScript_09C2::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_286E::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_286E::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_AIN_MOVIE_END: { tOSIRISEVTAINOTIFY *event_data = &data->evt_ain_movie_end; @@ -5658,7 +5658,7 @@ short CustomObjectScript_286E::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0005::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0005::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5703,7 +5703,7 @@ short TriggerScript_0005::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5722,7 +5722,7 @@ short TriggerScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0006::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0006::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5744,7 +5744,7 @@ short TriggerScript_0006::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0004::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0004::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5767,7 +5767,7 @@ short TriggerScript_0004::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0008::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0008::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5786,7 +5786,7 @@ short TriggerScript_0008::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0009::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0009::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5804,7 +5804,7 @@ short TriggerScript_0009::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_000F::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_000F::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5822,7 +5822,7 @@ short TriggerScript_000F::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0013::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0013::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5840,7 +5840,7 @@ short TriggerScript_0013::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0012::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0012::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5858,7 +5858,7 @@ short TriggerScript_0012::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0011::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0011::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5876,7 +5876,7 @@ short TriggerScript_0011::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0010::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0010::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5894,7 +5894,7 @@ short TriggerScript_0010::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_000E::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_000E::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5912,7 +5912,7 @@ short TriggerScript_000E::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_000C::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_000C::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5930,7 +5930,7 @@ short TriggerScript_000C::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_000D::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_000D::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5948,7 +5948,7 @@ short TriggerScript_000D::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_000A::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_000A::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5966,7 +5966,7 @@ short TriggerScript_000A::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_000B::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_000B::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; diff --git a/scripts/Mysterious_Isle.cpp b/scripts/Mysterious_Isle.cpp index 3a91b902..d35f8c4b 100644 --- a/scripts/Mysterious_Isle.cpp +++ b/scripts/Mysterious_Isle.cpp @@ -40,7 +40,7 @@ DLLEXPORT void STDCALL ShutdownDLL(void); DLLEXPORT int STDCALL GetGOScriptID(const char *name, uint8_t is_door); DLLEXPORT void STDCALLPTR CreateInstance(int id); DLLEXPORT void STDCALL DestroyInstance(int id, void *ptr); -DLLEXPORT short STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data); +DLLEXPORT int16_t STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data); DLLEXPORT int STDCALL GetTriggerScriptID(int trigger_room, int trigger_face); DLLEXPORT int STDCALL GetCOScriptList(int **list, int **id_list); DLLEXPORT int STDCALL SaveRestoreState(void *file_ptr, uint8_t saving_state); @@ -73,67 +73,67 @@ class BaseScript { public: BaseScript(); ~BaseScript(); - virtual short CallEvent(int event, tOSIRISEventInfo *data); + virtual int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class LevelScript_0000 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_481D : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_101E : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_1021 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_1022 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_1035 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_1020 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_1823 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_182A : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_101F : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_2828 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0829 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; // ====================== @@ -761,7 +761,7 @@ void STDCALL DestroyInstance(int id, void *ptr) { // =================== // CallInstanceEvent() // =================== -short STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data) { +int16_t STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data) { switch (id) { case ID_LEVEL_0000: case ID_CUSTOM_OBJECT_481D: @@ -831,12 +831,12 @@ BaseScript::BaseScript() {} BaseScript::~BaseScript() {} -short BaseScript::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t BaseScript::CallEvent(int event, tOSIRISEventInfo *data) { mprintf(0, "BaseScript::CallEvent()\n"); return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_SAVESTATE: { tOSIRISEVTSAVESTATE *event_data = &data->evt_savestate; @@ -1016,7 +1016,7 @@ short LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_481D::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_481D::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { tOSIRISEVTCREATED *event_data = &data->evt_created; @@ -1035,7 +1035,7 @@ short CustomObjectScript_481D::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_101E::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_101E::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { tOSIRISEVTCREATED *event_data = &data->evt_created; @@ -1054,7 +1054,7 @@ short CustomObjectScript_101E::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_1021::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_1021::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { tOSIRISEVTCREATED *event_data = &data->evt_created; @@ -1073,7 +1073,7 @@ short CustomObjectScript_1021::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_1022::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_1022::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { tOSIRISEVTCREATED *event_data = &data->evt_created; @@ -1092,7 +1092,7 @@ short CustomObjectScript_1022::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_1035::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_1035::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { tOSIRISEVTCREATED *event_data = &data->evt_created; @@ -1111,7 +1111,7 @@ short CustomObjectScript_1035::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_1020::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_1020::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { tOSIRISEVTCREATED *event_data = &data->evt_created; @@ -1130,7 +1130,7 @@ short CustomObjectScript_1020::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_1823::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_1823::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { tOSIRISEVTCREATED *event_data = &data->evt_created; @@ -1149,7 +1149,7 @@ short CustomObjectScript_1823::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_182A::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_182A::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { tOSIRISEVTCREATED *event_data = &data->evt_created; @@ -1168,7 +1168,7 @@ short CustomObjectScript_182A::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_101F::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_101F::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { tOSIRISEVTCREATED *event_data = &data->evt_created; @@ -1187,7 +1187,7 @@ short CustomObjectScript_101F::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_2828::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_2828::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -1215,7 +1215,7 @@ short CustomObjectScript_2828::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0829::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0829::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; diff --git a/scripts/Paranoia.cpp b/scripts/Paranoia.cpp index b4e9cf61..74b139f6 100644 --- a/scripts/Paranoia.cpp +++ b/scripts/Paranoia.cpp @@ -40,7 +40,7 @@ DLLEXPORT void STDCALL ShutdownDLL(void); DLLEXPORT int STDCALL GetGOScriptID(const char *name, uint8_t is_door); DLLEXPORT void STDCALLPTR CreateInstance(int id); DLLEXPORT void STDCALL DestroyInstance(int id, void *ptr); -DLLEXPORT short STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data); +DLLEXPORT int16_t STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data); DLLEXPORT int STDCALL GetTriggerScriptID(int trigger_room, int trigger_face); DLLEXPORT int STDCALL GetCOScriptList(int **list, int **id_list); DLLEXPORT int STDCALL SaveRestoreState(void *file_ptr, uint8_t saving_state); @@ -61,12 +61,12 @@ class BaseScript { public: BaseScript(); ~BaseScript(); - virtual short CallEvent(int event, tOSIRISEventInfo *data); + virtual int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class LevelScript_0000 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; // ====================== @@ -410,7 +410,7 @@ void STDCALL DestroyInstance(int id, void *ptr) { // =================== // CallInstanceEvent() // =================== -short STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data) { +int16_t STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data) { switch (id) { case ID_LEVEL_0000: return ((BaseScript *)ptr)->CallEvent(event, data); @@ -453,12 +453,12 @@ BaseScript::BaseScript() {} BaseScript::~BaseScript() {} -short BaseScript::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t BaseScript::CallEvent(int event, tOSIRISEventInfo *data) { mprintf(0, "BaseScript::CallEvent()\n"); return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_SAVESTATE: { tOSIRISEVTSAVESTATE *event_data = &data->evt_savestate; diff --git a/scripts/PiccuStation.cpp b/scripts/PiccuStation.cpp index e858cd14..0ec4a329 100644 --- a/scripts/PiccuStation.cpp +++ b/scripts/PiccuStation.cpp @@ -40,7 +40,7 @@ DLLEXPORT void STDCALL ShutdownDLL(void); DLLEXPORT int STDCALL GetGOScriptID(const char *name, uint8_t is_door); DLLEXPORT void STDCALLPTR CreateInstance(int id); DLLEXPORT void STDCALL DestroyInstance(int id, void *ptr); -DLLEXPORT short STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data); +DLLEXPORT int16_t STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data); DLLEXPORT int STDCALL GetTriggerScriptID(int trigger_room, int trigger_face); DLLEXPORT int STDCALL GetCOScriptList(int **list, int **id_list); DLLEXPORT int STDCALL SaveRestoreState(void *file_ptr, uint8_t saving_state); @@ -137,382 +137,382 @@ class BaseScript { public: BaseScript(); ~BaseScript(); - virtual short CallEvent(int event, tOSIRISEventInfo *data); + virtual int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class LevelScript_0000 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_2109 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_206D : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_306C : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_1869 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_186A : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_184A : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_4049 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0961 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0960 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_095F : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_095E : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_3072 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_406F : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0B3C : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_1338 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_1337 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_1339 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_133A : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_1B35 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_1B34 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_1B41 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_1336 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_6856 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0B40 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0B30 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0B31 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_1B2E : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0B2F : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0B32 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_232D : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0B3F : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0B3B : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0B3D : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0B3E : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_1195 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0005 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0004 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0003 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0012 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0002 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0000 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0013 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0014 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0016 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0017 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0015 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_001B : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_001A : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0019 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0018 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_001F : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0009 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_001E : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_001D : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_000F : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_000B : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_001C : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_000D : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0007 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_000E : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_002B : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_002A : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0029 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0028 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0027 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0025 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0026 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_000A : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0024 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0021 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0023 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0020 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0022 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_002C : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; // ====================== @@ -1855,7 +1855,7 @@ void STDCALL DestroyInstance(int id, void *ptr) { // =================== // CallInstanceEvent() // =================== -short STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data) { +int16_t STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data) { switch (id) { case ID_LEVEL_0000: case ID_CUSTOM_OBJECT_2109: @@ -2137,12 +2137,12 @@ BaseScript::BaseScript() {} BaseScript::~BaseScript() {} -short BaseScript::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t BaseScript::CallEvent(int event, tOSIRISEventInfo *data) { mprintf(0, "BaseScript::CallEvent()\n"); return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_SAVESTATE: { tOSIRISEVTSAVESTATE *event_data = &data->evt_savestate; @@ -2373,7 +2373,7 @@ short LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_2109::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_2109::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -2394,7 +2394,7 @@ short CustomObjectScript_2109::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_206D::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_206D::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -2417,7 +2417,7 @@ short CustomObjectScript_206D::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_306C::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_306C::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_DESTROY: { tOSIRISEVTDESTROY *event_data = &data->evt_destroy; @@ -2440,7 +2440,7 @@ short CustomObjectScript_306C::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_1869::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_1869::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -2467,7 +2467,7 @@ short CustomObjectScript_1869::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_186A::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_186A::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -2494,7 +2494,7 @@ short CustomObjectScript_186A::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_184A::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_184A::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -2522,7 +2522,7 @@ short CustomObjectScript_184A::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_4049::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_4049::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -2550,7 +2550,7 @@ short CustomObjectScript_4049::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0961::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0961::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -2602,7 +2602,7 @@ short CustomObjectScript_0961::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0960::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0960::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -2654,7 +2654,7 @@ short CustomObjectScript_0960::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_095F::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_095F::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -2706,7 +2706,7 @@ short CustomObjectScript_095F::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_095E::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_095E::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -2758,7 +2758,7 @@ short CustomObjectScript_095E::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_3072::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_3072::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -2786,7 +2786,7 @@ short CustomObjectScript_3072::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_406F::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_406F::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -2814,7 +2814,7 @@ short CustomObjectScript_406F::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0B3C::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0B3C::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -2846,7 +2846,7 @@ short CustomObjectScript_0B3C::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_1338::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_1338::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -2867,7 +2867,7 @@ short CustomObjectScript_1338::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_1337::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_1337::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -2889,7 +2889,7 @@ short CustomObjectScript_1337::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_1339::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_1339::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -2911,7 +2911,7 @@ short CustomObjectScript_1339::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_133A::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_133A::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -2933,7 +2933,7 @@ short CustomObjectScript_133A::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_1B35::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_1B35::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -2955,7 +2955,7 @@ short CustomObjectScript_1B35::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_1B34::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_1B34::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -2977,7 +2977,7 @@ short CustomObjectScript_1B34::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_1B41::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_1B41::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -2999,7 +2999,7 @@ short CustomObjectScript_1B41::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_1336::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_1336::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -3021,7 +3021,7 @@ short CustomObjectScript_1336::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_6856::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_6856::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3046,7 +3046,7 @@ short CustomObjectScript_6856::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0B40::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0B40::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_AIN_MOVIE_END: { tOSIRISEVTAINOTIFY *event_data = &data->evt_ain_movie_end; @@ -3078,7 +3078,7 @@ short CustomObjectScript_0B40::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0B30::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0B30::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CHILD_DIED: { tOSIRISEVTCHILDDIED *event_data = &data->evt_child_died; @@ -3098,7 +3098,7 @@ short CustomObjectScript_0B30::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0B31::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0B31::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CHILD_DIED: { tOSIRISEVTCHILDDIED *event_data = &data->evt_child_died; @@ -3118,7 +3118,7 @@ short CustomObjectScript_0B31::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_1B2E::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_1B2E::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CHILD_DIED: { tOSIRISEVTCHILDDIED *event_data = &data->evt_child_died; @@ -3138,7 +3138,7 @@ short CustomObjectScript_1B2E::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0B2F::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0B2F::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CHILD_DIED: { tOSIRISEVTCHILDDIED *event_data = &data->evt_child_died; @@ -3158,7 +3158,7 @@ short CustomObjectScript_0B2F::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0B32::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0B32::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CHILD_DIED: { tOSIRISEVTCHILDDIED *event_data = &data->evt_child_died; @@ -3178,7 +3178,7 @@ short CustomObjectScript_0B32::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_232D::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_232D::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CHILD_DIED: { tOSIRISEVTCHILDDIED *event_data = &data->evt_child_died; @@ -3198,7 +3198,7 @@ short CustomObjectScript_232D::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0B3F::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0B3F::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CHILD_DIED: { tOSIRISEVTCHILDDIED *event_data = &data->evt_child_died; @@ -3218,7 +3218,7 @@ short CustomObjectScript_0B3F::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0B3B::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0B3B::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CHILD_DIED: { tOSIRISEVTCHILDDIED *event_data = &data->evt_child_died; @@ -3238,7 +3238,7 @@ short CustomObjectScript_0B3B::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0B3D::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0B3D::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CHILD_DIED: { tOSIRISEVTCHILDDIED *event_data = &data->evt_child_died; @@ -3258,7 +3258,7 @@ short CustomObjectScript_0B3D::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0B3E::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0B3E::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CHILD_DIED: { tOSIRISEVTCHILDDIED *event_data = &data->evt_child_died; @@ -3278,7 +3278,7 @@ short CustomObjectScript_0B3E::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_1195::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_1195::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_DESTROY: { tOSIRISEVTDESTROY *event_data = &data->evt_destroy; @@ -3301,7 +3301,7 @@ short CustomObjectScript_1195::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0005::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0005::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3319,7 +3319,7 @@ short TriggerScript_0005::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0004::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0004::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3346,7 +3346,7 @@ short TriggerScript_0004::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0003::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0003::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3373,7 +3373,7 @@ short TriggerScript_0003::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0012::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0012::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3391,7 +3391,7 @@ short TriggerScript_0012::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0002::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0002::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3409,7 +3409,7 @@ short TriggerScript_0002::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3427,7 +3427,7 @@ short TriggerScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0013::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0013::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3445,7 +3445,7 @@ short TriggerScript_0013::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0014::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0014::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3468,7 +3468,7 @@ short TriggerScript_0014::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0016::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0016::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3495,7 +3495,7 @@ short TriggerScript_0016::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0017::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0017::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3522,7 +3522,7 @@ short TriggerScript_0017::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0015::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0015::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3549,7 +3549,7 @@ short TriggerScript_0015::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_001B::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_001B::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3576,7 +3576,7 @@ short TriggerScript_001B::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_001A::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_001A::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3603,7 +3603,7 @@ short TriggerScript_001A::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0019::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0019::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3630,7 +3630,7 @@ short TriggerScript_0019::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0018::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0018::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3657,7 +3657,7 @@ short TriggerScript_0018::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_001F::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_001F::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3675,7 +3675,7 @@ short TriggerScript_001F::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0009::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0009::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3693,7 +3693,7 @@ short TriggerScript_0009::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_001E::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_001E::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3711,7 +3711,7 @@ short TriggerScript_001E::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_001D::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_001D::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3729,7 +3729,7 @@ short TriggerScript_001D::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_000F::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_000F::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3747,7 +3747,7 @@ short TriggerScript_000F::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_000B::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_000B::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3774,7 +3774,7 @@ short TriggerScript_000B::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_001C::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_001C::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3792,7 +3792,7 @@ short TriggerScript_001C::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_000D::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_000D::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3810,7 +3810,7 @@ short TriggerScript_000D::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0007::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0007::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3828,7 +3828,7 @@ short TriggerScript_0007::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_000E::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_000E::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3846,7 +3846,7 @@ short TriggerScript_000E::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_002B::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_002B::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3864,7 +3864,7 @@ short TriggerScript_002B::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_002A::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_002A::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3882,7 +3882,7 @@ short TriggerScript_002A::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0029::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0029::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3900,7 +3900,7 @@ short TriggerScript_0029::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0028::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0028::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3918,7 +3918,7 @@ short TriggerScript_0028::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0027::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0027::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3936,7 +3936,7 @@ short TriggerScript_0027::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0025::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0025::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3954,7 +3954,7 @@ short TriggerScript_0025::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0026::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0026::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3972,7 +3972,7 @@ short TriggerScript_0026::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_000A::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_000A::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3990,7 +3990,7 @@ short TriggerScript_000A::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0024::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0024::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -4008,7 +4008,7 @@ short TriggerScript_0024::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0021::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0021::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -4026,7 +4026,7 @@ short TriggerScript_0021::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0023::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0023::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -4044,7 +4044,7 @@ short TriggerScript_0023::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0020::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0020::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -4062,7 +4062,7 @@ short TriggerScript_0020::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0022::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0022::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -4080,7 +4080,7 @@ short TriggerScript_0022::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_002C::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_002C::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; diff --git a/scripts/Polaris.cpp b/scripts/Polaris.cpp index d0e23b8e..e723140d 100644 --- a/scripts/Polaris.cpp +++ b/scripts/Polaris.cpp @@ -40,7 +40,7 @@ DLLEXPORT void STDCALL ShutdownDLL(void); DLLEXPORT int STDCALL GetGOScriptID(const char *name, uint8_t is_door); DLLEXPORT void STDCALLPTR CreateInstance(int id); DLLEXPORT void STDCALL DestroyInstance(int id, void *ptr); -DLLEXPORT short STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data); +DLLEXPORT int16_t STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data); DLLEXPORT int STDCALL GetTriggerScriptID(int trigger_room, int trigger_face); DLLEXPORT int STDCALL GetCOScriptList(int **list, int **id_list); DLLEXPORT int STDCALL SaveRestoreState(void *file_ptr, uint8_t saving_state); @@ -68,37 +68,37 @@ class BaseScript { public: BaseScript(); ~BaseScript(); - virtual short CallEvent(int event, tOSIRISEventInfo *data); + virtual int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class LevelScript_0000 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_303F : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0000 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0001 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0002 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0003 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; // ====================== @@ -545,7 +545,7 @@ void STDCALL DestroyInstance(int id, void *ptr) { // =================== // CallInstanceEvent() // =================== -short STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data) { +int16_t STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data) { switch (id) { case ID_LEVEL_0000: case ID_CUSTOM_OBJECT_303F: @@ -610,12 +610,12 @@ BaseScript::BaseScript() {} BaseScript::~BaseScript() {} -short BaseScript::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t BaseScript::CallEvent(int event, tOSIRISEventInfo *data) { mprintf(0, "BaseScript::CallEvent()\n"); return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_SAVESTATE: { tOSIRISEVTSAVESTATE *event_data = &data->evt_savestate; @@ -652,7 +652,7 @@ short LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_303F::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_303F::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -681,7 +681,7 @@ short CustomObjectScript_303F::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -700,7 +700,7 @@ short TriggerScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0001::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0001::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -719,7 +719,7 @@ short TriggerScript_0001::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0002::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0002::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -738,7 +738,7 @@ short TriggerScript_0002::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0003::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0003::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; diff --git a/scripts/Quadsomniac.cpp b/scripts/Quadsomniac.cpp index 67597039..cbea1a6f 100644 --- a/scripts/Quadsomniac.cpp +++ b/scripts/Quadsomniac.cpp @@ -40,7 +40,7 @@ DLLEXPORT void STDCALL ShutdownDLL(void); DLLEXPORT int STDCALL GetGOScriptID(const char *name, uint8_t is_door); DLLEXPORT void STDCALLPTR CreateInstance(int id); DLLEXPORT void STDCALL DestroyInstance(int id, void *ptr); -DLLEXPORT short STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data); +DLLEXPORT int16_t STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data); DLLEXPORT int STDCALL GetTriggerScriptID(int trigger_room, int trigger_face); DLLEXPORT int STDCALL GetCOScriptList(int **list, int **id_list); DLLEXPORT int STDCALL SaveRestoreState(void *file_ptr, uint8_t saving_state); @@ -70,52 +70,52 @@ class BaseScript { public: BaseScript(); ~BaseScript(); - virtual short CallEvent(int event, tOSIRISEventInfo *data); + virtual int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class LevelScript_0000 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0004 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0006 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0002 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0000 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0005 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0007 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0003 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0001 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; // ====================== @@ -593,7 +593,7 @@ void STDCALL DestroyInstance(int id, void *ptr) { // =================== // CallInstanceEvent() // =================== -short STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data) { +int16_t STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data) { switch (id) { case ID_LEVEL_0000: case ID_TRIGGER_0004: @@ -670,12 +670,12 @@ BaseScript::BaseScript() {} BaseScript::~BaseScript() {} -short BaseScript::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t BaseScript::CallEvent(int event, tOSIRISEventInfo *data) { mprintf(0, "BaseScript::CallEvent()\n"); return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_SAVESTATE: { tOSIRISEVTSAVESTATE *event_data = &data->evt_savestate; @@ -711,7 +711,7 @@ short LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0004::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0004::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -730,7 +730,7 @@ short TriggerScript_0004::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0006::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0006::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -749,7 +749,7 @@ short TriggerScript_0006::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0002::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0002::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -768,7 +768,7 @@ short TriggerScript_0002::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -787,7 +787,7 @@ short TriggerScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0005::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0005::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -806,7 +806,7 @@ short TriggerScript_0005::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0007::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0007::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -825,7 +825,7 @@ short TriggerScript_0007::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0003::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0003::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -844,7 +844,7 @@ short TriggerScript_0003::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0001::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0001::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; diff --git a/scripts/RudeAwakening.cpp b/scripts/RudeAwakening.cpp index 917e2da7..26560f66 100644 --- a/scripts/RudeAwakening.cpp +++ b/scripts/RudeAwakening.cpp @@ -40,7 +40,7 @@ DLLEXPORT void STDCALL ShutdownDLL(void); DLLEXPORT int STDCALL GetGOScriptID(const char *name, uint8_t is_door); DLLEXPORT void STDCALLPTR CreateInstance(int id); DLLEXPORT void STDCALL DestroyInstance(int id, void *ptr); -DLLEXPORT short STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data); +DLLEXPORT int16_t STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data); DLLEXPORT int STDCALL GetTriggerScriptID(int trigger_room, int trigger_face); DLLEXPORT int STDCALL GetCOScriptList(int **list, int **id_list); DLLEXPORT int STDCALL SaveRestoreState(void *file_ptr, uint8_t saving_state); @@ -70,52 +70,52 @@ class BaseScript { public: BaseScript(); ~BaseScript(); - virtual short CallEvent(int event, tOSIRISEventInfo *data); + virtual int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class LevelScript_0000 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_1017 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_101A : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_1019 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_1016 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_1015 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_1018 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_1813 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_1014 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; // ====================== @@ -594,7 +594,7 @@ void STDCALL DestroyInstance(int id, void *ptr) { // =================== // CallInstanceEvent() // =================== -short STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data) { +int16_t STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data) { switch (id) { case ID_LEVEL_0000: case ID_CUSTOM_OBJECT_1017: @@ -657,12 +657,12 @@ BaseScript::BaseScript() {} BaseScript::~BaseScript() {} -short BaseScript::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t BaseScript::CallEvent(int event, tOSIRISEventInfo *data) { mprintf(0, "BaseScript::CallEvent()\n"); return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_SAVESTATE: { tOSIRISEVTSAVESTATE *event_data = &data->evt_savestate; @@ -707,7 +707,7 @@ short LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_1017::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_1017::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -735,7 +735,7 @@ short CustomObjectScript_1017::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_101A::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_101A::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -763,7 +763,7 @@ short CustomObjectScript_101A::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_1019::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_1019::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -791,7 +791,7 @@ short CustomObjectScript_1019::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_1016::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_1016::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -819,7 +819,7 @@ short CustomObjectScript_1016::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_1015::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_1015::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -847,7 +847,7 @@ short CustomObjectScript_1015::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_1018::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_1018::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -875,7 +875,7 @@ short CustomObjectScript_1018::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_1813::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_1813::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -903,7 +903,7 @@ short CustomObjectScript_1813::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_1014::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_1014::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; diff --git a/scripts/SewerRat.cpp b/scripts/SewerRat.cpp index 78f787bf..23c5e4a1 100644 --- a/scripts/SewerRat.cpp +++ b/scripts/SewerRat.cpp @@ -40,7 +40,7 @@ DLLEXPORT void STDCALL ShutdownDLL(void); DLLEXPORT int STDCALL GetGOScriptID(const char *name, uint8_t is_door); DLLEXPORT void STDCALLPTR CreateInstance(int id); DLLEXPORT void STDCALL DestroyInstance(int id, void *ptr); -DLLEXPORT short STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data); +DLLEXPORT int16_t STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data); DLLEXPORT int STDCALL GetTriggerScriptID(int trigger_room, int trigger_face); DLLEXPORT int STDCALL GetCOScriptList(int **list, int **id_list); DLLEXPORT int STDCALL SaveRestoreState(void *file_ptr, uint8_t saving_state); @@ -61,12 +61,12 @@ class BaseScript { public: BaseScript(); ~BaseScript(); - virtual short CallEvent(int event, tOSIRISEventInfo *data); + virtual int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class LevelScript_0000 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; // ====================== @@ -469,7 +469,7 @@ void STDCALL DestroyInstance(int id, void *ptr) { // =================== // CallInstanceEvent() // =================== -short STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data) { +int16_t STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data) { switch (id) { case ID_LEVEL_0000: return ((BaseScript *)ptr)->CallEvent(event, data); @@ -512,12 +512,12 @@ BaseScript::BaseScript() {} BaseScript::~BaseScript() {} -short BaseScript::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t BaseScript::CallEvent(int event, tOSIRISEventInfo *data) { mprintf(0, "BaseScript::CallEvent()\n"); return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_SAVESTATE: { tOSIRISEVTSAVESTATE *event_data = &data->evt_savestate; diff --git a/scripts/TrainingMission.cpp b/scripts/TrainingMission.cpp index 17ffb38a..c20e2886 100644 --- a/scripts/TrainingMission.cpp +++ b/scripts/TrainingMission.cpp @@ -40,7 +40,7 @@ DLLEXPORT void STDCALL ShutdownDLL(void); DLLEXPORT int STDCALL GetGOScriptID(const char *name, uint8_t is_door); DLLEXPORT void STDCALLPTR CreateInstance(int id); DLLEXPORT void STDCALL DestroyInstance(int id, void *ptr); -DLLEXPORT short STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data); +DLLEXPORT int16_t STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data); DLLEXPORT int STDCALL GetTriggerScriptID(int trigger_room, int trigger_face); DLLEXPORT int STDCALL GetCOScriptList(int **list, int **id_list); DLLEXPORT int STDCALL SaveRestoreState(void *file_ptr, uint8_t saving_state); @@ -92,157 +92,157 @@ class BaseScript { public: BaseScript(); ~BaseScript(); - virtual short CallEvent(int event, tOSIRISEventInfo *data); + virtual int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class LevelScript_0000 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_300D : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_300C : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_300B : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_4809 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_1803 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_1806 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_100A : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_300E : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_2007 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_080F : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_2008 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_1011 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_1010 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_1817 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_081A : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_081B : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_081D : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_081E : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_081C : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0819 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_101F : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0820 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0821 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0822 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0823 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_1824 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0000 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0001 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0002 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; // ====================== @@ -1213,7 +1213,7 @@ void STDCALL DestroyInstance(int id, void *ptr) { // =================== // CallInstanceEvent() // =================== -short STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data) { +int16_t STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data) { switch (id) { case ID_LEVEL_0000: case ID_CUSTOM_OBJECT_300D: @@ -1330,12 +1330,12 @@ BaseScript::BaseScript() {} BaseScript::~BaseScript() {} -short BaseScript::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t BaseScript::CallEvent(int event, tOSIRISEventInfo *data) { mprintf(0, "BaseScript::CallEvent()\n"); return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_SAVESTATE: { tOSIRISEVTSAVESTATE *event_data = &data->evt_savestate; @@ -1634,7 +1634,7 @@ short LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_300D::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_300D::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -1668,7 +1668,7 @@ short CustomObjectScript_300D::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_300C::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_300C::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -1752,7 +1752,7 @@ short CustomObjectScript_300C::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_300B::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_300B::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -1786,7 +1786,7 @@ short CustomObjectScript_300B::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_4809::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_4809::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -1820,7 +1820,7 @@ short CustomObjectScript_4809::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_1803::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_1803::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -1841,7 +1841,7 @@ short CustomObjectScript_1803::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_1806::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_1806::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -1865,7 +1865,7 @@ short CustomObjectScript_1806::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_100A::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_100A::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -1905,7 +1905,7 @@ short CustomObjectScript_100A::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_300E::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_300E::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -1947,7 +1947,7 @@ short CustomObjectScript_300E::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_2007::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_2007::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -1966,7 +1966,7 @@ short CustomObjectScript_2007::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_080F::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_080F::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -1993,7 +1993,7 @@ short CustomObjectScript_080F::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_2008::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_2008::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_DESTROY: { tOSIRISEVTDESTROY *event_data = &data->evt_destroy; @@ -2032,7 +2032,7 @@ short CustomObjectScript_2008::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_1011::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_1011::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_DESTROY: { tOSIRISEVTDESTROY *event_data = &data->evt_destroy; @@ -2055,7 +2055,7 @@ short CustomObjectScript_1011::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_1010::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_1010::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_DESTROY: { tOSIRISEVTDESTROY *event_data = &data->evt_destroy; @@ -2081,7 +2081,7 @@ short CustomObjectScript_1010::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_1817::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_1817::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -2116,7 +2116,7 @@ short CustomObjectScript_1817::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_081A::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_081A::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_DESTROY: { tOSIRISEVTDESTROY *event_data = &data->evt_destroy; @@ -2137,7 +2137,7 @@ short CustomObjectScript_081A::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_081B::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_081B::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_DESTROY: { tOSIRISEVTDESTROY *event_data = &data->evt_destroy; @@ -2158,7 +2158,7 @@ short CustomObjectScript_081B::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_081D::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_081D::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_DESTROY: { tOSIRISEVTDESTROY *event_data = &data->evt_destroy; @@ -2179,7 +2179,7 @@ short CustomObjectScript_081D::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_081E::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_081E::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_DESTROY: { tOSIRISEVTDESTROY *event_data = &data->evt_destroy; @@ -2200,7 +2200,7 @@ short CustomObjectScript_081E::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_081C::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_081C::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -2217,7 +2217,7 @@ short CustomObjectScript_081C::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0819::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0819::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -2234,7 +2234,7 @@ short CustomObjectScript_0819::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_101F::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_101F::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_DESTROY: { tOSIRISEVTDESTROY *event_data = &data->evt_destroy; @@ -2255,7 +2255,7 @@ short CustomObjectScript_101F::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0820::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0820::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_DESTROY: { tOSIRISEVTDESTROY *event_data = &data->evt_destroy; @@ -2276,7 +2276,7 @@ short CustomObjectScript_0820::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0821::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0821::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_DESTROY: { tOSIRISEVTDESTROY *event_data = &data->evt_destroy; @@ -2297,7 +2297,7 @@ short CustomObjectScript_0821::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0822::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0822::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_DESTROY: { tOSIRISEVTDESTROY *event_data = &data->evt_destroy; @@ -2318,7 +2318,7 @@ short CustomObjectScript_0822::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0823::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0823::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_DESTROY: { tOSIRISEVTDESTROY *event_data = &data->evt_destroy; @@ -2339,7 +2339,7 @@ short CustomObjectScript_0823::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_1824::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_1824::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -2357,7 +2357,7 @@ short CustomObjectScript_1824::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -2381,7 +2381,7 @@ short TriggerScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0001::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0001::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -2404,7 +2404,7 @@ short TriggerScript_0001::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0002::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0002::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; diff --git a/scripts/Y2K.cpp b/scripts/Y2K.cpp index 10b6a0b6..625b146a 100644 --- a/scripts/Y2K.cpp +++ b/scripts/Y2K.cpp @@ -40,7 +40,7 @@ DLLEXPORT void STDCALL ShutdownDLL(void); DLLEXPORT int STDCALL GetGOScriptID(const char *name, uint8_t is_door); DLLEXPORT void STDCALLPTR CreateInstance(int id); DLLEXPORT void STDCALL DestroyInstance(int id, void *ptr); -DLLEXPORT short STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data); +DLLEXPORT int16_t STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data); DLLEXPORT int STDCALL GetTriggerScriptID(int trigger_room, int trigger_face); DLLEXPORT int STDCALL GetCOScriptList(int **list, int **id_list); DLLEXPORT int STDCALL SaveRestoreState(void *file_ptr, uint8_t saving_state); @@ -61,12 +61,12 @@ class BaseScript { public: BaseScript(); ~BaseScript(); - virtual short CallEvent(int event, tOSIRISEventInfo *data); + virtual int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class LevelScript_0000 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; // ====================== @@ -474,7 +474,7 @@ void STDCALL DestroyInstance(int id, void *ptr) { // =================== // CallInstanceEvent() // =================== -short STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data) { +int16_t STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data) { switch (id) { case ID_LEVEL_0000: return ((BaseScript *)ptr)->CallEvent(event, data); @@ -517,12 +517,12 @@ BaseScript::BaseScript() {} BaseScript::~BaseScript() {} -short BaseScript::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t BaseScript::CallEvent(int event, tOSIRISEventInfo *data) { mprintf(0, "BaseScript::CallEvent()\n"); return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_SAVESTATE: { tOSIRISEVTSAVESTATE *event_data = &data->evt_savestate; diff --git a/scripts/aigame2.cpp b/scripts/aigame2.cpp index 1ad42936..c8d259c3 100644 --- a/scripts/aigame2.cpp +++ b/scripts/aigame2.cpp @@ -36,7 +36,7 @@ DLLEXPORT void STDCALL ShutdownDLL(void); DLLEXPORT int STDCALL GetGOScriptID(const char *name, uint8_t isdoor); DLLEXPORT void STDCALLPTR CreateInstance(int id); DLLEXPORT void STDCALL DestroyInstance(int id, void *ptr); -DLLEXPORT short STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data); +DLLEXPORT int16_t STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data); DLLEXPORT int STDCALL SaveRestoreState(void *file_ptr, uint8_t saving_state); #ifdef __cplusplus } @@ -82,7 +82,7 @@ static const char *const Script_names[NUM_IDS] = {"Samir's Pest", "StormTrooperB // ai base class class aiObjScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); protected: // Handles all possible OSIRIS events. @@ -151,8 +151,8 @@ private: int8_t snipe_points; int8_t cur_snipe_point; int8_t laser_targeted; - short backpack_hp; // points before destroy backpack. - short flee_hp; + int16_t backpack_hp; // points before destroy backpack. + int16_t flee_hp; // a Nx(N-1) array with a extra int for number of VALID connecting snipe points per snipe point. // note: obvious cases ignored (ptA->ptA) @@ -193,8 +193,8 @@ private: float eye_timer; int8_t state; uint8_t melee_flags; - short energy; - short hits; + int16_t energy; + int16_t hits; int eye_obj; }; @@ -360,7 +360,7 @@ void STDCALL DestroyInstance(int id, void *ptr) { // the game for that event. This only pertains to certain events. If the chain continues // after this script, than the CONTINUE_DEFAULT setting will be overridden by lower priority // scripts return value. -short STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data) { +int16_t STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data) { return ((aiObjScript *)ptr)->CallEvent(event, data); } @@ -572,7 +572,7 @@ int TurnOnSpew(int objref, int gunpoint, int effect_type, float mass, float drag ////////////////////////////////////////////////////////////////////////////// // aiObjScript // all ai scripts will have this as a base function. -short aiObjScript::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t aiObjScript::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_AI_INIT: OnInit(data->me_handle); @@ -965,7 +965,7 @@ void aiBlackStormTrooper::OnInterval(tOSIRISEventInfo *data) { void aiBlackStormTrooper::OnDamaged(int me_handle, tOSIRISEVTDAMAGED *evt) { if (memory->state == STATE_BASE || memory->state == STATE_SNIPE) { - memory->flee_hp -= (short)evt->damage; + memory->flee_hp -= (int16_t)evt->damage; if (memory->flee_hp <= 0) { memory->flee_hp = 50; set_state(me_handle, STATE_HIDE); diff --git a/scripts/aigame4.cpp b/scripts/aigame4.cpp index 8eb9f1d1..341211e1 100644 --- a/scripts/aigame4.cpp +++ b/scripts/aigame4.cpp @@ -36,7 +36,7 @@ DLLEXPORT void STDCALL ShutdownDLL(void); DLLEXPORT int STDCALL GetGOScriptID(const char *name, uint8_t isdoor); DLLEXPORT void STDCALLPTR CreateInstance(int id); DLLEXPORT void STDCALL DestroyInstance(int id, void *ptr); -DLLEXPORT short STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data); +DLLEXPORT int16_t STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data); DLLEXPORT int STDCALL SaveRestoreState(void *file_ptr, uint8_t saving_state); #ifdef __cplusplus } @@ -127,7 +127,7 @@ class BaseObjScript { public: BaseObjScript(); ~BaseObjScript(); - virtual short CallEvent(int event, tOSIRISEventInfo *data); + virtual int16_t CallEvent(int event, tOSIRISEventInfo *data); }; typedef struct { @@ -148,7 +148,7 @@ private: public: CombWallHit() {} - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; //------------------ @@ -166,7 +166,7 @@ private: public: DropTarget() {} - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; //------------------ @@ -183,7 +183,7 @@ class Gun : public BaseObjScript { public: Gun() {} - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; //------------------ @@ -200,7 +200,7 @@ private: public: Casing() {} - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; //------------------ @@ -261,7 +261,7 @@ private: public: MercEndBoss() {} - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; //------------------ @@ -274,7 +274,7 @@ private: public: HangLight() {} - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; //---------------- @@ -371,7 +371,7 @@ void STDCALL DestroyInstance(int id, void *ptr) { } } -short STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data) { +int16_t STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data) { return ((BaseObjScript *)ptr)->CallEvent(event, data); } @@ -421,7 +421,7 @@ BaseObjScript::BaseObjScript() {} BaseObjScript::~BaseObjScript() {} -short BaseObjScript::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } +int16_t BaseObjScript::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } //------------------ // MercEndBoss class @@ -1080,7 +1080,7 @@ void MercEndBoss::DoFrame(int me) { memory->last_frame = frame; } -short MercEndBoss::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t MercEndBoss::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { int type; @@ -1144,7 +1144,7 @@ short MercEndBoss::CallEvent(int event, tOSIRISEventInfo *data) { // Gun class //------------------ -short Gun::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t Gun::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_AI_INIT: { tOSIRISMEMCHUNK ch; @@ -1211,7 +1211,7 @@ short Gun::CallEvent(int event, tOSIRISEventInfo *data) { // Casing class //------------------ -short Casing::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t Casing::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { tOSIRISMEMCHUNK ch; @@ -1248,7 +1248,7 @@ short Casing::CallEvent(int event, tOSIRISEventInfo *data) { // CombWallHit class //------------------ -short CombWallHit::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CombWallHit::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { tOSIRISMEMCHUNK ch; @@ -1286,7 +1286,7 @@ short CombWallHit::CallEvent(int event, tOSIRISEventInfo *data) { // DropTarget class //------------------ -short DropTarget::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t DropTarget::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { tOSIRISMEMCHUNK ch; @@ -1339,7 +1339,7 @@ short DropTarget::CallEvent(int event, tOSIRISEventInfo *data) { void HangLight::DoInit(int me) { CreateAndAttach(me, "MERC3_danglinglightbulb", OBJ_CLUTTER, 0, 0, true, true); } -short HangLight::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t HangLight::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: DoInit(data->me_handle); diff --git a/scripts/barney.cpp b/scripts/barney.cpp index 03d11e62..346ec4fb 100644 --- a/scripts/barney.cpp +++ b/scripts/barney.cpp @@ -40,7 +40,7 @@ DLLEXPORT void STDCALL ShutdownDLL(void); DLLEXPORT int STDCALL GetGOScriptID(const char *name, uint8_t is_door); DLLEXPORT void STDCALLPTR CreateInstance(int id); DLLEXPORT void STDCALL DestroyInstance(int id, void *ptr); -DLLEXPORT short STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data); +DLLEXPORT int16_t STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data); DLLEXPORT int STDCALL GetTriggerScriptID(int trigger_room, int trigger_face); DLLEXPORT int STDCALL GetCOScriptList(int **list, int **id_list); DLLEXPORT int STDCALL SaveRestoreState(void *file_ptr, uint8_t saving_state); @@ -61,12 +61,12 @@ class BaseScript { public: BaseScript(); ~BaseScript(); - virtual short CallEvent(int event, tOSIRISEventInfo *data); + virtual int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class LevelScript_0000 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; // ====================== @@ -432,7 +432,7 @@ void STDCALL DestroyInstance(int id, void *ptr) { // =================== // CallInstanceEvent() // =================== -short STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data) { +int16_t STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data) { switch (id) { case ID_LEVEL_0000: return ((BaseScript *)ptr)->CallEvent(event, data); @@ -475,12 +475,12 @@ BaseScript::BaseScript() {} BaseScript::~BaseScript() {} -short BaseScript::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t BaseScript::CallEvent(int event, tOSIRISEventInfo *data) { mprintf(0, "BaseScript::CallEvent()\n"); return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_SAVESTATE: { tOSIRISEVTSAVESTATE *event_data = &data->evt_savestate; diff --git a/scripts/clutter.cpp b/scripts/clutter.cpp index f28f88a5..03512e4c 100644 --- a/scripts/clutter.cpp +++ b/scripts/clutter.cpp @@ -35,7 +35,7 @@ DLLEXPORT void STDCALL ShutdownDLL(void); DLLEXPORT int STDCALL GetGOScriptID(const char *name, uint8_t isdoor); DLLEXPORT void STDCALLPTR CreateInstance(int id); DLLEXPORT void STDCALL DestroyInstance(int id, void *ptr); -DLLEXPORT short STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data); +DLLEXPORT int16_t STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data); DLLEXPORT int STDCALL SaveRestoreState(void *file_ptr, uint8_t saving_state); #ifdef __cplusplus } @@ -79,22 +79,22 @@ static int NumScriptIDs = sizeof(ScriptIDs) / sizeof(tScriptInfo); class ClutterScript { public: - virtual short CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } + virtual int16_t CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } }; class FragCrate : public ClutterScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class NapalmBarrel : public ClutterScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class AliencuplinkScript : public ClutterScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; typedef struct { @@ -104,14 +104,14 @@ typedef struct { class TNTHighYield : public ClutterScript { public: TNTHighYield() { memory = NULL; } - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); tTNTHighYield *memory; }; class TNTMedYield : public ClutterScript { public: TNTMedYield() { memory = NULL; } - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); float *memory; }; @@ -121,13 +121,13 @@ typedef struct { class FallingRock : public ClutterScript { public: FallingRock() { memory = NULL; } - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); tFallingRock *memory; }; class LavaRock : public ClutterScript { public: LavaRock() { memory = NULL; } - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); tFallingRock *memory; }; @@ -258,7 +258,7 @@ void STDCALL DestroyInstance(int id, void *ptr) { // the game for that event. This only pertains to certain events. If the chain continues // after this script, than the CONTINUE_DEFAULT setting will be overridden by lower priority // scripts return value. -short STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data) { +int16_t STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data) { return ((ClutterScript *)ptr)->CallEvent(event, data); } @@ -290,7 +290,7 @@ int GetObjectID(int object) { return ms.id; } -short FragCrate::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t FragCrate::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_DESTROY: vector pos; @@ -311,7 +311,7 @@ short FragCrate::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short NapalmBarrel::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t NapalmBarrel::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_DESTROY: vector pos; @@ -351,7 +351,7 @@ short NapalmBarrel::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short AliencuplinkScript::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t AliencuplinkScript::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_AI_INIT: int handle, id, room; @@ -392,7 +392,7 @@ float GetObjectShields(int object) { return mstruct.shields; } -short TNTMedYield::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TNTMedYield::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { int i; @@ -443,7 +443,7 @@ short TNTMedYield::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TNTHighYield::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TNTHighYield::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { int i; @@ -540,7 +540,7 @@ short TNTHighYield::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short FallingRock::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t FallingRock::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { int i; @@ -574,7 +574,7 @@ short FallingRock::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short LavaRock::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t LavaRock::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { int i; diff --git a/scripts/generic.cpp b/scripts/generic.cpp index 7ca7e383..19df150a 100644 --- a/scripts/generic.cpp +++ b/scripts/generic.cpp @@ -35,7 +35,7 @@ DLLEXPORT void STDCALL ShutdownDLL(void); DLLEXPORT int STDCALL GetGOScriptID(const char *name, uint8_t isdoor); DLLEXPORT void STDCALLPTR CreateInstance(int id); DLLEXPORT void STDCALL DestroyInstance(int id, void *ptr); -DLLEXPORT short STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data); +DLLEXPORT int16_t STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data); DLLEXPORT int STDCALL SaveRestoreState(void *file_ptr, uint8_t saving_state); #ifdef __cplusplus } @@ -88,7 +88,7 @@ tScriptIDInfo ScriptIDInfo[NUM_IDS] = { class GenericScript { public: GenericScript() {} - virtual short CallEvent(int event, tOSIRISEventInfo *data); + virtual int16_t CallEvent(int event, tOSIRISEventInfo *data); protected: }; @@ -96,7 +96,7 @@ protected: class GenericDoor : public GenericScript { public: GenericDoor() {} - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; typedef struct { @@ -106,14 +106,14 @@ typedef struct { class ForceWallScript : public GenericScript { public: ForceWallScript(); - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); forcewallmemory *memory; }; class WingNutScript : public GenericScript { public: WingNutScript() {} - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; typedef struct { @@ -130,7 +130,7 @@ class RapidFireScript : public GenericScript { public: RapidFireScript(); - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); rapidfirememory *memory; }; @@ -259,7 +259,7 @@ void STDCALL DestroyInstance(int id, void *ptr) { // the game for that event. This only pertains to certain events. If the chain continues // after this script, than the CONTINUE_DEFAULT setting will be overridden by lower priority // scripts return value. -short STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data) { +int16_t STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data) { switch (id) { case GENERIC_POWERUP_SCRIPTID: case GENERIC_DOOR_SCRIPTID: @@ -313,7 +313,7 @@ int STDCALL SaveRestoreState(void *file_ptr, uint8_t saving_state) { return size; } -short GenericScript::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t GenericScript::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { msafe_struct ms; @@ -331,7 +331,7 @@ short GenericScript::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short GenericDoor::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t GenericDoor::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { msafe_struct ms; @@ -385,7 +385,7 @@ short GenericDoor::CallEvent(int event, tOSIRISEventInfo *data) { RapidFireScript::RapidFireScript() { memory = NULL; } #define RAPIDFIRE_RECHARGE 0.7f -short RapidFireScript::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t RapidFireScript::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { tOSIRISMEMCHUNK ch; @@ -529,7 +529,7 @@ short RapidFireScript::CallEvent(int event, tOSIRISEventInfo *data) { ForceWallScript::ForceWallScript() { memory = NULL; } -short ForceWallScript::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t ForceWallScript::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { @@ -626,7 +626,7 @@ short ForceWallScript::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short WingNutScript::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t WingNutScript::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { msafe_struct ms; diff --git a/scripts/level1.cpp b/scripts/level1.cpp index 10f3a35b..8d23312a 100644 --- a/scripts/level1.cpp +++ b/scripts/level1.cpp @@ -40,7 +40,7 @@ DLLEXPORT void STDCALL ShutdownDLL(void); DLLEXPORT int STDCALL GetGOScriptID(const char *name, uint8_t is_door); DLLEXPORT void STDCALLPTR CreateInstance(int id); DLLEXPORT void STDCALL DestroyInstance(int id, void *ptr); -DLLEXPORT short STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data); +DLLEXPORT int16_t STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data); DLLEXPORT int STDCALL GetTriggerScriptID(int trigger_room, int trigger_face); DLLEXPORT int STDCALL GetCOScriptList(int **list, int **id_list); DLLEXPORT int STDCALL SaveRestoreState(void *file_ptr, uint8_t saving_state); @@ -87,132 +87,132 @@ class BaseScript { public: BaseScript(); ~BaseScript(); - virtual short CallEvent(int event, tOSIRISEventInfo *data); + virtual int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class LevelScript_0000 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_3855 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_10DC : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_10E0 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_10DF : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_08E8 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_584D : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0816 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_100D : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_301B : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_18DB : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_000C : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0011 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0000 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0001 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0002 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0003 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0004 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0006 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0005 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_000A : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_000B : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0008 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0007 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0009 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; // ====================== @@ -955,7 +955,7 @@ void STDCALL DestroyInstance(int id, void *ptr) { // =================== // CallInstanceEvent() // =================== -short STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data) { +int16_t STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data) { switch (id) { case ID_LEVEL_0000: case ID_CUSTOM_OBJECT_3855: @@ -1081,12 +1081,12 @@ BaseScript::BaseScript() {} BaseScript::~BaseScript() {} -short BaseScript::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t BaseScript::CallEvent(int event, tOSIRISEventInfo *data) { mprintf(0, "BaseScript::CallEvent()\n"); return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_SAVESTATE: { tOSIRISEVTSAVESTATE *event_data = &data->evt_savestate; @@ -1332,7 +1332,7 @@ short LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_3855::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_3855::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -1357,7 +1357,7 @@ short CustomObjectScript_3855::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_10DC::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_10DC::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -1376,7 +1376,7 @@ short CustomObjectScript_10DC::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_10E0::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_10E0::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -1402,7 +1402,7 @@ short CustomObjectScript_10E0::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_10DF::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_10DF::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -1428,7 +1428,7 @@ short CustomObjectScript_10DF::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_08E8::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_08E8::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -1508,7 +1508,7 @@ short CustomObjectScript_08E8::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_584D::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_584D::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -1529,7 +1529,7 @@ short CustomObjectScript_584D::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0816::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0816::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -1549,7 +1549,7 @@ short CustomObjectScript_0816::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_100D::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_100D::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -1583,7 +1583,7 @@ short CustomObjectScript_100D::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_301B::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_301B::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -1622,7 +1622,7 @@ short CustomObjectScript_301B::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_18DB::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_18DB::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -1661,7 +1661,7 @@ short CustomObjectScript_18DB::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_000C::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_000C::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -1682,7 +1682,7 @@ short TriggerScript_000C::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0011::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0011::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -1720,7 +1720,7 @@ short TriggerScript_0011::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -1739,7 +1739,7 @@ short TriggerScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0001::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0001::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -1757,7 +1757,7 @@ short TriggerScript_0001::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0002::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0002::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -1784,7 +1784,7 @@ short TriggerScript_0002::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0003::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0003::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -1802,7 +1802,7 @@ short TriggerScript_0003::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0004::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0004::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -1820,7 +1820,7 @@ short TriggerScript_0004::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0006::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0006::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -1838,7 +1838,7 @@ short TriggerScript_0006::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0005::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0005::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -1856,7 +1856,7 @@ short TriggerScript_0005::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_000A::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_000A::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -1874,7 +1874,7 @@ short TriggerScript_000A::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_000B::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_000B::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -1892,7 +1892,7 @@ short TriggerScript_000B::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0008::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0008::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -1910,7 +1910,7 @@ short TriggerScript_0008::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0007::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0007::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -1928,7 +1928,7 @@ short TriggerScript_0007::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0009::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0009::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; diff --git a/scripts/level10.cpp b/scripts/level10.cpp index 7976a2f1..0fe16502 100644 --- a/scripts/level10.cpp +++ b/scripts/level10.cpp @@ -40,7 +40,7 @@ DLLEXPORT void STDCALL ShutdownDLL(void); DLLEXPORT int STDCALL GetGOScriptID(const char *name, uint8_t is_door); DLLEXPORT void STDCALLPTR CreateInstance(int id); DLLEXPORT void STDCALL DestroyInstance(int id, void *ptr); -DLLEXPORT short STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data); +DLLEXPORT int16_t STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data); DLLEXPORT int STDCALL GetTriggerScriptID(int trigger_room, int trigger_face); DLLEXPORT int STDCALL GetCOScriptList(int **list, int **id_list); DLLEXPORT int STDCALL SaveRestoreState(void *file_ptr, uint8_t saving_state); @@ -146,427 +146,427 @@ class BaseScript { public: BaseScript(); ~BaseScript(); - virtual short CallEvent(int event, tOSIRISEventInfo *data); + virtual int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class LevelScript_0000 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_2042 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_10A3 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_094B : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0945 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_113E : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_193F : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_2140 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0875 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0877 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_105C : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0878 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_28BA : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_2133 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_1139 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_098A : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_08AA : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_18BF : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_10C0 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_2904 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_3088 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_2105 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_3092 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_187C : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_10FA : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0903 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_1902 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_4047 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_289B : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_3849 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_184B : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_204A : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_2064 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_1065 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_2063 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_5843 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_1095 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_1094 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_1080 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_187F : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_501A : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_D80D : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_18A1 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_208B : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_2074 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_203D : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_11B1 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_3898 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_303C : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_2090 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_09D4 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_1050 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_2044 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_1845 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_1058 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_09A3 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_11AF : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_49B0 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_11D2 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_09D5 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_18A5 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_10FB : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_19A2 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_09A4 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_09A5 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_09A6 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_09A1 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_20FD : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_187E : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_987D : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_09AA : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0816 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0007 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_000B : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0008 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0004 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0002 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0009 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0006 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0003 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0001 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0005 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_000A : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0013 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; // ====================== @@ -2297,7 +2297,7 @@ void STDCALL DestroyInstance(int id, void *ptr) { // =================== // CallInstanceEvent() // =================== -short STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data) { +int16_t STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data) { switch (id) { case ID_LEVEL_0000: case ID_CUSTOM_OBJECT_2042: @@ -2549,12 +2549,12 @@ BaseScript::BaseScript() {} BaseScript::~BaseScript() {} -short BaseScript::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t BaseScript::CallEvent(int event, tOSIRISEventInfo *data) { mprintf(0, "BaseScript::CallEvent()\n"); return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_SAVESTATE: { tOSIRISEVTSAVESTATE *event_data = &data->evt_savestate; @@ -3289,7 +3289,7 @@ short LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_2042::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_2042::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { tOSIRISEVTCREATED *event_data = &data->evt_created; @@ -3361,7 +3361,7 @@ short CustomObjectScript_2042::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_10A3::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_10A3::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { tOSIRISEVTCREATED *event_data = &data->evt_created; @@ -3380,7 +3380,7 @@ short CustomObjectScript_10A3::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_094B::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_094B::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { tOSIRISEVTCREATED *event_data = &data->evt_created; @@ -3399,7 +3399,7 @@ short CustomObjectScript_094B::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0945::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0945::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3427,7 +3427,7 @@ short CustomObjectScript_0945::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_113E::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_113E::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { tOSIRISEVTCREATED *event_data = &data->evt_created; @@ -3446,7 +3446,7 @@ short CustomObjectScript_113E::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_193F::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_193F::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { tOSIRISEVTCREATED *event_data = &data->evt_created; @@ -3465,7 +3465,7 @@ short CustomObjectScript_193F::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_2140::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_2140::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { tOSIRISEVTCREATED *event_data = &data->evt_created; @@ -3520,7 +3520,7 @@ short CustomObjectScript_2140::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0875::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0875::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3544,7 +3544,7 @@ short CustomObjectScript_0875::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0877::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0877::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3568,7 +3568,7 @@ short CustomObjectScript_0877::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_105C::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_105C::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3592,7 +3592,7 @@ short CustomObjectScript_105C::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0878::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0878::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3616,7 +3616,7 @@ short CustomObjectScript_0878::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_28BA::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_28BA::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_AIN_SEEPLAYER: { tOSIRISEVTAINOTIFY *event_data = &data->evt_ain_seeplayer; @@ -3654,7 +3654,7 @@ short CustomObjectScript_28BA::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_2133::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_2133::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { tOSIRISEVTCREATED *event_data = &data->evt_created; @@ -3715,7 +3715,7 @@ short CustomObjectScript_2133::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_1139::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_1139::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { tOSIRISEVTCREATED *event_data = &data->evt_created; @@ -3768,7 +3768,7 @@ short CustomObjectScript_1139::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_098A::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_098A::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { tOSIRISEVTCREATED *event_data = &data->evt_created; @@ -3786,7 +3786,7 @@ short CustomObjectScript_098A::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_08AA::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_08AA::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { tOSIRISEVTCREATED *event_data = &data->evt_created; @@ -3804,7 +3804,7 @@ short CustomObjectScript_08AA::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_18BF::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_18BF::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { tOSIRISEVTCREATED *event_data = &data->evt_created; @@ -3888,7 +3888,7 @@ short CustomObjectScript_18BF::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_10C0::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_10C0::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_AIN_SEEPLAYER: { tOSIRISEVTAINOTIFY *event_data = &data->evt_ain_seeplayer; @@ -3944,7 +3944,7 @@ short CustomObjectScript_10C0::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_2904::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_2904::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_DESTROY: { tOSIRISEVTDESTROY *event_data = &data->evt_destroy; @@ -3966,7 +3966,7 @@ short CustomObjectScript_2904::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_3088::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_3088::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3988,7 +3988,7 @@ short CustomObjectScript_3088::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_2105::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_2105::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -4010,7 +4010,7 @@ short CustomObjectScript_2105::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_3092::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_3092::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -4031,7 +4031,7 @@ short CustomObjectScript_3092::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_187C::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_187C::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -4051,7 +4051,7 @@ short CustomObjectScript_187C::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_10FA::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_10FA::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -4071,7 +4071,7 @@ short CustomObjectScript_10FA::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0903::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0903::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -4091,7 +4091,7 @@ short CustomObjectScript_0903::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_1902::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_1902::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -4111,7 +4111,7 @@ short CustomObjectScript_1902::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_4047::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_4047::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -4131,7 +4131,7 @@ short CustomObjectScript_4047::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_289B::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_289B::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -4164,7 +4164,7 @@ short CustomObjectScript_289B::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_3849::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_3849::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -4201,7 +4201,7 @@ short CustomObjectScript_3849::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_184B::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_184B::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -4240,7 +4240,7 @@ short CustomObjectScript_184B::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_204A::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_204A::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -4283,7 +4283,7 @@ short CustomObjectScript_204A::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_2064::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_2064::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -4317,7 +4317,7 @@ short CustomObjectScript_2064::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_1065::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_1065::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -4351,7 +4351,7 @@ short CustomObjectScript_1065::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_2063::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_2063::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -4385,7 +4385,7 @@ short CustomObjectScript_2063::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_5843::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_5843::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -4419,7 +4419,7 @@ short CustomObjectScript_5843::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_1095::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_1095::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -4453,7 +4453,7 @@ short CustomObjectScript_1095::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_1094::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_1094::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -4487,7 +4487,7 @@ short CustomObjectScript_1094::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_1080::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_1080::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -4521,7 +4521,7 @@ short CustomObjectScript_1080::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_187F::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_187F::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -4555,7 +4555,7 @@ short CustomObjectScript_187F::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_501A::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_501A::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -4589,7 +4589,7 @@ short CustomObjectScript_501A::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_D80D::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_D80D::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -4623,7 +4623,7 @@ short CustomObjectScript_D80D::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_18A1::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_18A1::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -4710,7 +4710,7 @@ short CustomObjectScript_18A1::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_208B::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_208B::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -4742,7 +4742,7 @@ short CustomObjectScript_208B::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_2074::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_2074::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { tOSIRISEVTCREATED *event_data = &data->evt_created; @@ -4780,7 +4780,7 @@ short CustomObjectScript_2074::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_203D::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_203D::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { tOSIRISEVTCREATED *event_data = &data->evt_created; @@ -4813,7 +4813,7 @@ short CustomObjectScript_203D::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_11B1::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_11B1::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { tOSIRISEVTCREATED *event_data = &data->evt_created; @@ -4851,7 +4851,7 @@ short CustomObjectScript_11B1::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_3898::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_3898::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { tOSIRISEVTCREATED *event_data = &data->evt_created; @@ -4886,7 +4886,7 @@ short CustomObjectScript_3898::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_303C::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_303C::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { tOSIRISEVTCREATED *event_data = &data->evt_created; @@ -4919,7 +4919,7 @@ short CustomObjectScript_303C::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_2090::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_2090::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { tOSIRISEVTCREATED *event_data = &data->evt_created; @@ -4956,7 +4956,7 @@ short CustomObjectScript_2090::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_09D4::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_09D4::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { tOSIRISEVTCREATED *event_data = &data->evt_created; @@ -4991,7 +4991,7 @@ short CustomObjectScript_09D4::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_1050::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_1050::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5015,7 +5015,7 @@ short CustomObjectScript_1050::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_2044::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_2044::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5039,7 +5039,7 @@ short CustomObjectScript_2044::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_1845::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_1845::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5063,7 +5063,7 @@ short CustomObjectScript_1845::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_1058::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_1058::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5087,7 +5087,7 @@ short CustomObjectScript_1058::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_09A3::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_09A3::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5108,7 +5108,7 @@ short CustomObjectScript_09A3::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_11AF::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_11AF::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5132,7 +5132,7 @@ short CustomObjectScript_11AF::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_49B0::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_49B0::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5156,7 +5156,7 @@ short CustomObjectScript_49B0::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_11D2::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_11D2::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5180,7 +5180,7 @@ short CustomObjectScript_11D2::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_09D5::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_09D5::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5204,7 +5204,7 @@ short CustomObjectScript_09D5::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_18A5::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_18A5::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5226,7 +5226,7 @@ short CustomObjectScript_18A5::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_10FB::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_10FB::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5248,7 +5248,7 @@ short CustomObjectScript_10FB::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_19A2::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_19A2::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5269,7 +5269,7 @@ short CustomObjectScript_19A2::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_09A4::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_09A4::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5292,7 +5292,7 @@ short CustomObjectScript_09A4::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_09A5::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_09A5::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5315,7 +5315,7 @@ short CustomObjectScript_09A5::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_09A6::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_09A6::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5338,7 +5338,7 @@ short CustomObjectScript_09A6::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_09A1::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_09A1::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5360,7 +5360,7 @@ short CustomObjectScript_09A1::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_20FD::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_20FD::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5382,7 +5382,7 @@ short CustomObjectScript_20FD::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_187E::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_187E::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5426,7 +5426,7 @@ short CustomObjectScript_187E::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_987D::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_987D::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5446,7 +5446,7 @@ short CustomObjectScript_987D::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_09AA::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_09AA::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_AIN_GOALCOMPLETE: { tOSIRISEVTAINOTIFY *event_data = &data->evt_ain_goalcomplete; @@ -5481,7 +5481,7 @@ short CustomObjectScript_09AA::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0816::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0816::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5501,7 +5501,7 @@ short CustomObjectScript_0816::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0007::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0007::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5529,7 +5529,7 @@ short TriggerScript_0007::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_000B::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_000B::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5547,7 +5547,7 @@ short TriggerScript_000B::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0008::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0008::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5565,7 +5565,7 @@ short TriggerScript_0008::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0004::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0004::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5583,7 +5583,7 @@ short TriggerScript_0004::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0002::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0002::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5601,7 +5601,7 @@ short TriggerScript_0002::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0009::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0009::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5619,7 +5619,7 @@ short TriggerScript_0009::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0006::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0006::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5637,7 +5637,7 @@ short TriggerScript_0006::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0003::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0003::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5655,7 +5655,7 @@ short TriggerScript_0003::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0001::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0001::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5673,7 +5673,7 @@ short TriggerScript_0001::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0005::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0005::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5691,7 +5691,7 @@ short TriggerScript_0005::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_000A::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_000A::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5709,7 +5709,7 @@ short TriggerScript_000A::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0013::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0013::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; diff --git a/scripts/level11.cpp b/scripts/level11.cpp index 843ca5d8..3e5a18cd 100644 --- a/scripts/level11.cpp +++ b/scripts/level11.cpp @@ -40,7 +40,7 @@ DLLEXPORT void STDCALL ShutdownDLL(void); DLLEXPORT int STDCALL GetGOScriptID(const char *name, uint8_t is_door); DLLEXPORT void STDCALLPTR CreateInstance(int id); DLLEXPORT void STDCALL DestroyInstance(int id, void *ptr); -DLLEXPORT short STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data); +DLLEXPORT int16_t STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data); DLLEXPORT int STDCALL GetTriggerScriptID(int trigger_room, int trigger_face); DLLEXPORT int STDCALL GetCOScriptList(int **list, int **id_list); DLLEXPORT int STDCALL SaveRestoreState(void *file_ptr, uint8_t saving_state); @@ -211,752 +211,752 @@ class BaseScript { public: BaseScript(); ~BaseScript(); - virtual short CallEvent(int event, tOSIRISEventInfo *data); + virtual int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class LevelScript_0000 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0985 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0942 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0941 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_092B : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_093E : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0940 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_093F : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0954 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_3951 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_08CF : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_08CC : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_10D2 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0943 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0944 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_08CE : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0952 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0953 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_1826 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_1180 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_1919 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0911 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_310B : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_10D0 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_08D1 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0A12 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_097C : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_097D : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_097E : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_097B : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_097A : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0976 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0977 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0978 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0979 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0975 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0974 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0973 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0972 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0971 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0970 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_096F : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_096E : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_1182 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_1181 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_110A : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_1109 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_1108 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_10DF : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_10DE : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_10DD : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_10DC : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_10DB : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_10D6 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_10D7 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_10D8 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_116C : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_10D5 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_10DA : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_18D4 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_18CD : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_18D3 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_10EA : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_18EC : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_10EB : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_18E6 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_10E8 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_10E9 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_10E7 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_10E3 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_10E5 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_10E4 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_18E2 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_10EE : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_18ED : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_10F6 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_10F7 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_10F5 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_10F8 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_18EF : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_18F0 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_10F9 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_10FA : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_10FB : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_10FD : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_10FC : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_10FE : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_10FF : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_20F1 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_10F4 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_10F3 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_10F2 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_1101 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_1100 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_1102 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_1103 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_1106 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_1107 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_1104 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_1105 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0A53 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_080F : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_096A : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0A66 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0A65 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0A64 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0A63 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0A62 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_1221 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_096B : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0969 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_1A7F : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_227E : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0007 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0006 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0008 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0000 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0001 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0002 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0005 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0004 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0003 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0009 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0024 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_000B : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0010 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_000D : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_000C : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0011 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0013 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_001B : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_001C : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0020 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_001F : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0015 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0014 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_001D : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0022 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0018 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0017 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_001A : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0019 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0016 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0012 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0021 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_001E : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0025 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0023 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0026 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; // ====================== @@ -3078,7 +3078,7 @@ void STDCALL DestroyInstance(int id, void *ptr) { // =================== // CallInstanceEvent() // =================== -short STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data) { +int16_t STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data) { switch (id) { case ID_LEVEL_0000: case ID_CUSTOM_OBJECT_0985: @@ -3516,12 +3516,12 @@ BaseScript::BaseScript() {} BaseScript::~BaseScript() {} -short BaseScript::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t BaseScript::CallEvent(int event, tOSIRISEventInfo *data) { mprintf(0, "BaseScript::CallEvent()\n"); return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_SAVESTATE: { tOSIRISEVTSAVESTATE *event_data = &data->evt_savestate; @@ -3648,7 +3648,7 @@ short LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0985::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0985::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { tOSIRISEVTCREATED *event_data = &data->evt_created; @@ -3666,7 +3666,7 @@ short CustomObjectScript_0985::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0942::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0942::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_DESTROY: { tOSIRISEVTDESTROY *event_data = &data->evt_destroy; @@ -3688,7 +3688,7 @@ short CustomObjectScript_0942::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0941::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0941::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_DESTROY: { tOSIRISEVTDESTROY *event_data = &data->evt_destroy; @@ -3710,7 +3710,7 @@ short CustomObjectScript_0941::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_092B::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_092B::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_DESTROY: { tOSIRISEVTDESTROY *event_data = &data->evt_destroy; @@ -3735,7 +3735,7 @@ short CustomObjectScript_092B::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_093E::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_093E::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_DESTROY: { tOSIRISEVTDESTROY *event_data = &data->evt_destroy; @@ -3763,7 +3763,7 @@ short CustomObjectScript_093E::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0940::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0940::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_DESTROY: { tOSIRISEVTDESTROY *event_data = &data->evt_destroy; @@ -3791,7 +3791,7 @@ short CustomObjectScript_0940::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_093F::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_093F::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_DESTROY: { tOSIRISEVTDESTROY *event_data = &data->evt_destroy; @@ -3819,7 +3819,7 @@ short CustomObjectScript_093F::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0954::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0954::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_DESTROY: { tOSIRISEVTDESTROY *event_data = &data->evt_destroy; @@ -3845,7 +3845,7 @@ short CustomObjectScript_0954::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_3951::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_3951::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_DESTROY: { tOSIRISEVTDESTROY *event_data = &data->evt_destroy; @@ -3871,7 +3871,7 @@ short CustomObjectScript_3951::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_08CF::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_08CF::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3896,7 +3896,7 @@ short CustomObjectScript_08CF::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_08CC::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_08CC::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3921,7 +3921,7 @@ short CustomObjectScript_08CC::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_10D2::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_10D2::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3948,7 +3948,7 @@ short CustomObjectScript_10D2::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0943::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0943::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3973,7 +3973,7 @@ short CustomObjectScript_0943::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0944::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0944::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3998,7 +3998,7 @@ short CustomObjectScript_0944::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_08CE::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_08CE::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -4023,7 +4023,7 @@ short CustomObjectScript_08CE::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0952::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0952::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -4048,7 +4048,7 @@ short CustomObjectScript_0952::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0953::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0953::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -4073,7 +4073,7 @@ short CustomObjectScript_0953::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_1826::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_1826::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -4100,7 +4100,7 @@ short CustomObjectScript_1826::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_1180::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_1180::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -4122,7 +4122,7 @@ short CustomObjectScript_1180::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_1919::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_1919::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -4176,7 +4176,7 @@ short CustomObjectScript_1919::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0911::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0911::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { tOSIRISEVTCREATED *event_data = &data->evt_created; @@ -4202,7 +4202,7 @@ short CustomObjectScript_0911::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_310B::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_310B::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -4227,7 +4227,7 @@ short CustomObjectScript_310B::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_10D0::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_10D0::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -4251,7 +4251,7 @@ short CustomObjectScript_10D0::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_08D1::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_08D1::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -4275,7 +4275,7 @@ short CustomObjectScript_08D1::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0A12::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0A12::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { tOSIRISEVTCREATED *event_data = &data->evt_created; @@ -4294,7 +4294,7 @@ short CustomObjectScript_0A12::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_097C::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_097C::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { tOSIRISEVTCREATED *event_data = &data->evt_created; @@ -4313,7 +4313,7 @@ short CustomObjectScript_097C::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_097D::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_097D::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { tOSIRISEVTCREATED *event_data = &data->evt_created; @@ -4332,7 +4332,7 @@ short CustomObjectScript_097D::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_097E::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_097E::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { tOSIRISEVTCREATED *event_data = &data->evt_created; @@ -4351,7 +4351,7 @@ short CustomObjectScript_097E::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_097B::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_097B::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { tOSIRISEVTCREATED *event_data = &data->evt_created; @@ -4370,7 +4370,7 @@ short CustomObjectScript_097B::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_097A::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_097A::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { tOSIRISEVTCREATED *event_data = &data->evt_created; @@ -4389,7 +4389,7 @@ short CustomObjectScript_097A::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0976::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0976::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { tOSIRISEVTCREATED *event_data = &data->evt_created; @@ -4408,7 +4408,7 @@ short CustomObjectScript_0976::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0977::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0977::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { tOSIRISEVTCREATED *event_data = &data->evt_created; @@ -4427,7 +4427,7 @@ short CustomObjectScript_0977::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0978::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0978::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { tOSIRISEVTCREATED *event_data = &data->evt_created; @@ -4446,7 +4446,7 @@ short CustomObjectScript_0978::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0979::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0979::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { tOSIRISEVTCREATED *event_data = &data->evt_created; @@ -4465,7 +4465,7 @@ short CustomObjectScript_0979::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0975::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0975::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { tOSIRISEVTCREATED *event_data = &data->evt_created; @@ -4484,7 +4484,7 @@ short CustomObjectScript_0975::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0974::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0974::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { tOSIRISEVTCREATED *event_data = &data->evt_created; @@ -4503,7 +4503,7 @@ short CustomObjectScript_0974::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0973::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0973::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { tOSIRISEVTCREATED *event_data = &data->evt_created; @@ -4522,7 +4522,7 @@ short CustomObjectScript_0973::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0972::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0972::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { tOSIRISEVTCREATED *event_data = &data->evt_created; @@ -4541,7 +4541,7 @@ short CustomObjectScript_0972::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0971::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0971::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { tOSIRISEVTCREATED *event_data = &data->evt_created; @@ -4560,7 +4560,7 @@ short CustomObjectScript_0971::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0970::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0970::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { tOSIRISEVTCREATED *event_data = &data->evt_created; @@ -4579,7 +4579,7 @@ short CustomObjectScript_0970::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_096F::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_096F::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { tOSIRISEVTCREATED *event_data = &data->evt_created; @@ -4598,7 +4598,7 @@ short CustomObjectScript_096F::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_096E::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_096E::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { tOSIRISEVTCREATED *event_data = &data->evt_created; @@ -4617,7 +4617,7 @@ short CustomObjectScript_096E::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_1182::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_1182::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -4638,7 +4638,7 @@ short CustomObjectScript_1182::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_1181::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_1181::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -4659,7 +4659,7 @@ short CustomObjectScript_1181::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_110A::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_110A::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_INTERVAL: { tOSIRISEVTINTERVAL *event_data = &data->evt_interval; @@ -4692,7 +4692,7 @@ short CustomObjectScript_110A::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_1109::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_1109::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -4711,7 +4711,7 @@ short CustomObjectScript_1109::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_1108::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_1108::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -4730,7 +4730,7 @@ short CustomObjectScript_1108::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_10DF::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_10DF::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_INTERVAL: { tOSIRISEVTINTERVAL *event_data = &data->evt_interval; @@ -4751,7 +4751,7 @@ short CustomObjectScript_10DF::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_10DE::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_10DE::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_INTERVAL: { tOSIRISEVTINTERVAL *event_data = &data->evt_interval; @@ -4772,7 +4772,7 @@ short CustomObjectScript_10DE::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_10DD::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_10DD::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_INTERVAL: { tOSIRISEVTINTERVAL *event_data = &data->evt_interval; @@ -4793,7 +4793,7 @@ short CustomObjectScript_10DD::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_10DC::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_10DC::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_INTERVAL: { tOSIRISEVTINTERVAL *event_data = &data->evt_interval; @@ -4814,7 +4814,7 @@ short CustomObjectScript_10DC::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_10DB::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_10DB::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_INTERVAL: { tOSIRISEVTINTERVAL *event_data = &data->evt_interval; @@ -4837,7 +4837,7 @@ short CustomObjectScript_10DB::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_10D6::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_10D6::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_INTERVAL: { tOSIRISEVTINTERVAL *event_data = &data->evt_interval; @@ -4857,7 +4857,7 @@ short CustomObjectScript_10D6::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_10D7::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_10D7::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_INTERVAL: { tOSIRISEVTINTERVAL *event_data = &data->evt_interval; @@ -4879,7 +4879,7 @@ short CustomObjectScript_10D7::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_10D8::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_10D8::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_INTERVAL: { tOSIRISEVTINTERVAL *event_data = &data->evt_interval; @@ -4901,7 +4901,7 @@ short CustomObjectScript_10D8::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_116C::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_116C::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_INTERVAL: { tOSIRISEVTINTERVAL *event_data = &data->evt_interval; @@ -4922,7 +4922,7 @@ short CustomObjectScript_116C::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_10D5::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_10D5::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_INTERVAL: { tOSIRISEVTINTERVAL *event_data = &data->evt_interval; @@ -4945,7 +4945,7 @@ short CustomObjectScript_10D5::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_10DA::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_10DA::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_INTERVAL: { tOSIRISEVTINTERVAL *event_data = &data->evt_interval; @@ -4966,7 +4966,7 @@ short CustomObjectScript_10DA::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_18D4::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_18D4::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_INTERVAL: { tOSIRISEVTINTERVAL *event_data = &data->evt_interval; @@ -4989,7 +4989,7 @@ short CustomObjectScript_18D4::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_18CD::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_18CD::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_INTERVAL: { tOSIRISEVTINTERVAL *event_data = &data->evt_interval; @@ -5012,7 +5012,7 @@ short CustomObjectScript_18CD::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_18D3::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_18D3::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_INTERVAL: { tOSIRISEVTINTERVAL *event_data = &data->evt_interval; @@ -5034,7 +5034,7 @@ short CustomObjectScript_18D3::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_10EA::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_10EA::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5054,7 +5054,7 @@ short CustomObjectScript_10EA::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_18EC::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_18EC::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5074,7 +5074,7 @@ short CustomObjectScript_18EC::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_10EB::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_10EB::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5094,7 +5094,7 @@ short CustomObjectScript_10EB::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_18E6::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_18E6::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5115,7 +5115,7 @@ short CustomObjectScript_18E6::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_10E8::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_10E8::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5136,7 +5136,7 @@ short CustomObjectScript_10E8::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_10E9::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_10E9::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5157,7 +5157,7 @@ short CustomObjectScript_10E9::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_10E7::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_10E7::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5178,7 +5178,7 @@ short CustomObjectScript_10E7::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_10E3::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_10E3::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5199,7 +5199,7 @@ short CustomObjectScript_10E3::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_10E5::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_10E5::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5220,7 +5220,7 @@ short CustomObjectScript_10E5::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_10E4::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_10E4::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5241,7 +5241,7 @@ short CustomObjectScript_10E4::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_18E2::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_18E2::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5262,7 +5262,7 @@ short CustomObjectScript_18E2::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_10EE::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_10EE::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5281,7 +5281,7 @@ short CustomObjectScript_10EE::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_18ED::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_18ED::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5300,7 +5300,7 @@ short CustomObjectScript_18ED::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_10F6::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_10F6::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5321,7 +5321,7 @@ short CustomObjectScript_10F6::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_10F7::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_10F7::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5342,7 +5342,7 @@ short CustomObjectScript_10F7::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_10F5::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_10F5::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5363,7 +5363,7 @@ short CustomObjectScript_10F5::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_10F8::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_10F8::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5384,7 +5384,7 @@ short CustomObjectScript_10F8::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_18EF::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_18EF::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5403,7 +5403,7 @@ short CustomObjectScript_18EF::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_18F0::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_18F0::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5422,7 +5422,7 @@ short CustomObjectScript_18F0::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_10F9::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_10F9::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5442,7 +5442,7 @@ short CustomObjectScript_10F9::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_10FA::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_10FA::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5462,7 +5462,7 @@ short CustomObjectScript_10FA::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_10FB::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_10FB::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5482,7 +5482,7 @@ short CustomObjectScript_10FB::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_10FD::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_10FD::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5502,7 +5502,7 @@ short CustomObjectScript_10FD::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_10FC::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_10FC::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5522,7 +5522,7 @@ short CustomObjectScript_10FC::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_10FE::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_10FE::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5542,7 +5542,7 @@ short CustomObjectScript_10FE::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_10FF::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_10FF::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5560,7 +5560,7 @@ short CustomObjectScript_10FF::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_20F1::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_20F1::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5581,7 +5581,7 @@ short CustomObjectScript_20F1::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_10F4::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_10F4::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5602,7 +5602,7 @@ short CustomObjectScript_10F4::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_10F3::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_10F3::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5623,7 +5623,7 @@ short CustomObjectScript_10F3::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_10F2::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_10F2::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5644,7 +5644,7 @@ short CustomObjectScript_10F2::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_1101::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_1101::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5663,7 +5663,7 @@ short CustomObjectScript_1101::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_1100::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_1100::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5682,7 +5682,7 @@ short CustomObjectScript_1100::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_1102::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_1102::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5701,7 +5701,7 @@ short CustomObjectScript_1102::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_1103::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_1103::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5720,7 +5720,7 @@ short CustomObjectScript_1103::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_1106::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_1106::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5739,7 +5739,7 @@ short CustomObjectScript_1106::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_1107::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_1107::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5758,7 +5758,7 @@ short CustomObjectScript_1107::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_1104::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_1104::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5777,7 +5777,7 @@ short CustomObjectScript_1104::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_1105::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_1105::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5796,7 +5796,7 @@ short CustomObjectScript_1105::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0A53::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0A53::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5841,7 +5841,7 @@ short CustomObjectScript_0A53::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_080F::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_080F::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -5859,7 +5859,7 @@ short CustomObjectScript_080F::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_096A::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_096A::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_DESTROY: { tOSIRISEVTDESTROY *event_data = &data->evt_destroy; @@ -5891,7 +5891,7 @@ short CustomObjectScript_096A::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0A66::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0A66::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5934,7 +5934,7 @@ short CustomObjectScript_0A66::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0A65::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0A65::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5977,7 +5977,7 @@ short CustomObjectScript_0A65::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0A64::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0A64::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -6020,7 +6020,7 @@ short CustomObjectScript_0A64::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0A63::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0A63::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -6063,7 +6063,7 @@ short CustomObjectScript_0A63::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0A62::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0A62::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -6106,7 +6106,7 @@ short CustomObjectScript_0A62::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_1221::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_1221::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -6149,7 +6149,7 @@ short CustomObjectScript_1221::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_096B::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_096B::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_DESTROY: { tOSIRISEVTDESTROY *event_data = &data->evt_destroy; @@ -6196,7 +6196,7 @@ short CustomObjectScript_096B::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0969::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0969::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_DESTROY: { tOSIRISEVTDESTROY *event_data = &data->evt_destroy; @@ -6219,7 +6219,7 @@ short CustomObjectScript_0969::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_1A7F::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_1A7F::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -6240,7 +6240,7 @@ short CustomObjectScript_1A7F::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_227E::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_227E::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -6261,7 +6261,7 @@ short CustomObjectScript_227E::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0007::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0007::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -6279,7 +6279,7 @@ short TriggerScript_0007::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0006::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0006::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -6297,7 +6297,7 @@ short TriggerScript_0006::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0008::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0008::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -6317,7 +6317,7 @@ short TriggerScript_0008::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -6339,7 +6339,7 @@ short TriggerScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0001::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0001::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -6361,7 +6361,7 @@ short TriggerScript_0001::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0002::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0002::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -6401,7 +6401,7 @@ short TriggerScript_0002::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0005::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0005::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -6422,7 +6422,7 @@ short TriggerScript_0005::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0004::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0004::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -6443,7 +6443,7 @@ short TriggerScript_0004::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0003::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0003::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -6464,7 +6464,7 @@ short TriggerScript_0003::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0009::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0009::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -6485,7 +6485,7 @@ short TriggerScript_0009::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0024::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0024::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -6504,7 +6504,7 @@ short TriggerScript_0024::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_000B::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_000B::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -6523,7 +6523,7 @@ short TriggerScript_000B::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0010::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0010::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -6541,7 +6541,7 @@ short TriggerScript_0010::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_000D::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_000D::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -6559,7 +6559,7 @@ short TriggerScript_000D::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_000C::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_000C::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -6577,7 +6577,7 @@ short TriggerScript_000C::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0011::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0011::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -6595,7 +6595,7 @@ short TriggerScript_0011::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0013::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0013::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -6613,7 +6613,7 @@ short TriggerScript_0013::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_001B::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_001B::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -6631,7 +6631,7 @@ short TriggerScript_001B::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_001C::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_001C::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -6649,7 +6649,7 @@ short TriggerScript_001C::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0020::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0020::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -6667,7 +6667,7 @@ short TriggerScript_0020::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_001F::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_001F::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -6685,7 +6685,7 @@ short TriggerScript_001F::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0015::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0015::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -6703,7 +6703,7 @@ short TriggerScript_0015::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0014::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0014::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -6721,7 +6721,7 @@ short TriggerScript_0014::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_001D::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_001D::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -6739,7 +6739,7 @@ short TriggerScript_001D::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0022::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0022::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -6757,7 +6757,7 @@ short TriggerScript_0022::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0018::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0018::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -6775,7 +6775,7 @@ short TriggerScript_0018::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0017::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0017::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -6793,7 +6793,7 @@ short TriggerScript_0017::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_001A::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_001A::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -6811,7 +6811,7 @@ short TriggerScript_001A::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0019::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0019::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -6829,7 +6829,7 @@ short TriggerScript_0019::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0016::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0016::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -6847,7 +6847,7 @@ short TriggerScript_0016::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0012::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0012::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -6865,7 +6865,7 @@ short TriggerScript_0012::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0021::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0021::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -6883,7 +6883,7 @@ short TriggerScript_0021::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_001E::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_001E::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -6901,7 +6901,7 @@ short TriggerScript_001E::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0025::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0025::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -6919,7 +6919,7 @@ short TriggerScript_0025::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0023::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0023::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -6937,7 +6937,7 @@ short TriggerScript_0023::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0026::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0026::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; diff --git a/scripts/level13.cpp b/scripts/level13.cpp index 9d01b3de..1f194a19 100644 --- a/scripts/level13.cpp +++ b/scripts/level13.cpp @@ -40,7 +40,7 @@ DLLEXPORT void STDCALL ShutdownDLL(void); DLLEXPORT int STDCALL GetGOScriptID(const char *name, uint8_t is_door); DLLEXPORT void STDCALLPTR CreateInstance(int id); DLLEXPORT void STDCALL DestroyInstance(int id, void *ptr); -DLLEXPORT short STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data); +DLLEXPORT int16_t STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data); DLLEXPORT int STDCALL GetTriggerScriptID(int trigger_room, int trigger_face); DLLEXPORT int STDCALL GetCOScriptList(int **list, int **id_list); DLLEXPORT int STDCALL SaveRestoreState(void *file_ptr, uint8_t saving_state); @@ -169,542 +169,542 @@ class BaseScript { public: BaseScript(); ~BaseScript(); - virtual short CallEvent(int event, tOSIRISEventInfo *data); + virtual int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class LevelScript_0000 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_1074 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0878 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0877 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0879 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_6813 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_083A : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0853 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0837 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0852 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_2027 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_087E : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_9021 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_282A : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0838 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_083D : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_084E : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_085F : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_085D : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_085A : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0844 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0835 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_1816 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0825 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_084B : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0839 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_1847 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_10C6 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_11F6 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0A24 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0A23 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_18A0 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_1090 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_18B0 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_08B6 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_08B5 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_08A9 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_10BD : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_08BE : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_105C : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_084D : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_295F : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_182C : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_2023 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0840 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_30C7 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0A5C : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_1134 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0887 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_095B : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_295E : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_09F0 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_09D3 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_087D : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0869 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_09F9 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_193B : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0A08 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0A14 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_08CB : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0A35 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_9233 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_092B : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0929 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_112A : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0928 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_29E9 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0000 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_000B : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0005 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_000C : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0002 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0004 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0009 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_000A : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0006 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0028 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0026 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0023 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0021 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0020 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_001D : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_001C : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0019 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0018 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0015 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0010 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_000E : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0013 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0012 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_000F : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_000D : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0027 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0025 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0024 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0022 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_001F : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0016 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_001E : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_001B : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_001A : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0017 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0014 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0011 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0029 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_002A : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_002B : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; // ====================== @@ -2421,7 +2421,7 @@ void STDCALL DestroyInstance(int id, void *ptr) { // =================== // CallInstanceEvent() // =================== -short STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data) { +int16_t STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data) { switch (id) { case ID_LEVEL_0000: case ID_CUSTOM_OBJECT_1074: @@ -2774,12 +2774,12 @@ BaseScript::BaseScript() {} BaseScript::~BaseScript() {} -short BaseScript::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t BaseScript::CallEvent(int event, tOSIRISEventInfo *data) { mprintf(0, "BaseScript::CallEvent()\n"); return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_SAVESTATE: { tOSIRISEVTSAVESTATE *event_data = &data->evt_savestate; @@ -3030,7 +3030,7 @@ short LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_1074::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_1074::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3051,7 +3051,7 @@ short CustomObjectScript_1074::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0878::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0878::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3073,7 +3073,7 @@ short CustomObjectScript_0878::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0877::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0877::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3095,7 +3095,7 @@ short CustomObjectScript_0877::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0879::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0879::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3117,7 +3117,7 @@ short CustomObjectScript_0879::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_6813::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_6813::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3137,7 +3137,7 @@ short CustomObjectScript_6813::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_083A::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_083A::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3157,7 +3157,7 @@ short CustomObjectScript_083A::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0853::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0853::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3179,7 +3179,7 @@ short CustomObjectScript_0853::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0837::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0837::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3198,7 +3198,7 @@ short CustomObjectScript_0837::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0852::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0852::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { tOSIRISEVTCREATED *event_data = &data->evt_created; @@ -3217,7 +3217,7 @@ short CustomObjectScript_0852::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_2027::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_2027::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { tOSIRISEVTCREATED *event_data = &data->evt_created; @@ -3235,7 +3235,7 @@ short CustomObjectScript_2027::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_087E::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_087E::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { tOSIRISEVTCREATED *event_data = &data->evt_created; @@ -3253,7 +3253,7 @@ short CustomObjectScript_087E::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_9021::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_9021::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3288,7 +3288,7 @@ short CustomObjectScript_9021::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_282A::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_282A::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3308,7 +3308,7 @@ short CustomObjectScript_282A::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0838::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0838::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3328,7 +3328,7 @@ short CustomObjectScript_0838::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_083D::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_083D::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3348,7 +3348,7 @@ short CustomObjectScript_083D::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_084E::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_084E::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3368,7 +3368,7 @@ short CustomObjectScript_084E::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_085F::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_085F::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3388,7 +3388,7 @@ short CustomObjectScript_085F::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_085D::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_085D::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3408,7 +3408,7 @@ short CustomObjectScript_085D::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_085A::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_085A::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3428,7 +3428,7 @@ short CustomObjectScript_085A::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0844::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0844::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3448,7 +3448,7 @@ short CustomObjectScript_0844::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0835::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0835::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3468,7 +3468,7 @@ short CustomObjectScript_0835::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_1816::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_1816::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3488,7 +3488,7 @@ short CustomObjectScript_1816::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0825::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0825::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3508,7 +3508,7 @@ short CustomObjectScript_0825::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_084B::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_084B::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3528,7 +3528,7 @@ short CustomObjectScript_084B::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0839::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0839::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3548,7 +3548,7 @@ short CustomObjectScript_0839::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_1847::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_1847::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3569,7 +3569,7 @@ short CustomObjectScript_1847::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_10C6::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_10C6::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3588,7 +3588,7 @@ short CustomObjectScript_10C6::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_11F6::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_11F6::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3607,7 +3607,7 @@ short CustomObjectScript_11F6::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0A24::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0A24::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3626,7 +3626,7 @@ short CustomObjectScript_0A24::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0A23::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0A23::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3645,7 +3645,7 @@ short CustomObjectScript_0A23::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_18A0::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_18A0::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3664,7 +3664,7 @@ short CustomObjectScript_18A0::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_1090::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_1090::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3683,7 +3683,7 @@ short CustomObjectScript_1090::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_18B0::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_18B0::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { tOSIRISEVTCREATED *event_data = &data->evt_created; @@ -3703,7 +3703,7 @@ short CustomObjectScript_18B0::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_08B6::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_08B6::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { tOSIRISEVTCREATED *event_data = &data->evt_created; @@ -3723,7 +3723,7 @@ short CustomObjectScript_08B6::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_08B5::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_08B5::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_DESTROY: { tOSIRISEVTDESTROY *event_data = &data->evt_destroy; @@ -3747,7 +3747,7 @@ short CustomObjectScript_08B5::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_08A9::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_08A9::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_DESTROY: { tOSIRISEVTDESTROY *event_data = &data->evt_destroy; @@ -3771,7 +3771,7 @@ short CustomObjectScript_08A9::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_10BD::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_10BD::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { tOSIRISEVTCREATED *event_data = &data->evt_created; @@ -3790,7 +3790,7 @@ short CustomObjectScript_10BD::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_08BE::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_08BE::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { tOSIRISEVTCREATED *event_data = &data->evt_created; @@ -3809,7 +3809,7 @@ short CustomObjectScript_08BE::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_105C::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_105C::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { tOSIRISEVTCREATED *event_data = &data->evt_created; @@ -3828,7 +3828,7 @@ short CustomObjectScript_105C::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_084D::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_084D::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { tOSIRISEVTCREATED *event_data = &data->evt_created; @@ -3847,7 +3847,7 @@ short CustomObjectScript_084D::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_295F::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_295F::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { tOSIRISEVTCREATED *event_data = &data->evt_created; @@ -3879,7 +3879,7 @@ short CustomObjectScript_295F::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_182C::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_182C::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { tOSIRISEVTCREATED *event_data = &data->evt_created; @@ -3898,7 +3898,7 @@ short CustomObjectScript_182C::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_2023::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_2023::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3919,7 +3919,7 @@ short CustomObjectScript_2023::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0840::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0840::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { tOSIRISEVTCREATED *event_data = &data->evt_created; @@ -3937,7 +3937,7 @@ short CustomObjectScript_0840::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_30C7::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_30C7::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_DESTROY: { tOSIRISEVTDESTROY *event_data = &data->evt_destroy; @@ -3976,7 +3976,7 @@ short CustomObjectScript_30C7::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0A5C::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0A5C::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -4013,7 +4013,7 @@ short CustomObjectScript_0A5C::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_1134::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_1134::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_AIN_SEEPLAYER: { tOSIRISEVTAINOTIFY *event_data = &data->evt_ain_seeplayer; @@ -4032,7 +4032,7 @@ short CustomObjectScript_1134::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0887::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0887::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_AIN_SEEPLAYER: { tOSIRISEVTAINOTIFY *event_data = &data->evt_ain_seeplayer; @@ -4051,7 +4051,7 @@ short CustomObjectScript_0887::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_095B::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_095B::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_AIN_SEEPLAYER: { tOSIRISEVTAINOTIFY *event_data = &data->evt_ain_seeplayer; @@ -4070,7 +4070,7 @@ short CustomObjectScript_095B::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_295E::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_295E::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_AIN_SEEPLAYER: { tOSIRISEVTAINOTIFY *event_data = &data->evt_ain_seeplayer; @@ -4089,7 +4089,7 @@ short CustomObjectScript_295E::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_09F0::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_09F0::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_AIN_SEEPLAYER: { tOSIRISEVTAINOTIFY *event_data = &data->evt_ain_seeplayer; @@ -4107,7 +4107,7 @@ short CustomObjectScript_09F0::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_09D3::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_09D3::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_AIN_SEEPLAYER: { tOSIRISEVTAINOTIFY *event_data = &data->evt_ain_seeplayer; @@ -4126,7 +4126,7 @@ short CustomObjectScript_09D3::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_087D::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_087D::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_AIN_SEEPLAYER: { tOSIRISEVTAINOTIFY *event_data = &data->evt_ain_seeplayer; @@ -4144,7 +4144,7 @@ short CustomObjectScript_087D::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0869::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0869::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_AIN_SEEPLAYER: { tOSIRISEVTAINOTIFY *event_data = &data->evt_ain_seeplayer; @@ -4162,7 +4162,7 @@ short CustomObjectScript_0869::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_09F9::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_09F9::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_AIN_SEEPLAYER: { tOSIRISEVTAINOTIFY *event_data = &data->evt_ain_seeplayer; @@ -4181,7 +4181,7 @@ short CustomObjectScript_09F9::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_193B::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_193B::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -4202,7 +4202,7 @@ short CustomObjectScript_193B::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0A08::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0A08::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -4245,7 +4245,7 @@ short CustomObjectScript_0A08::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0A14::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0A14::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -4275,7 +4275,7 @@ short CustomObjectScript_0A14::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_08CB::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_08CB::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_AIN_SEEPLAYER: { tOSIRISEVTAINOTIFY *event_data = &data->evt_ain_seeplayer; @@ -4292,7 +4292,7 @@ short CustomObjectScript_08CB::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0A35::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0A35::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { tOSIRISEVTCREATED *event_data = &data->evt_created; @@ -4310,7 +4310,7 @@ short CustomObjectScript_0A35::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_9233::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_9233::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { tOSIRISEVTCREATED *event_data = &data->evt_created; @@ -4328,7 +4328,7 @@ short CustomObjectScript_9233::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_092B::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_092B::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { tOSIRISEVTCREATED *event_data = &data->evt_created; @@ -4358,7 +4358,7 @@ short CustomObjectScript_092B::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0929::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0929::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { tOSIRISEVTCREATED *event_data = &data->evt_created; @@ -4388,7 +4388,7 @@ short CustomObjectScript_0929::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_112A::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_112A::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { tOSIRISEVTCREATED *event_data = &data->evt_created; @@ -4418,7 +4418,7 @@ short CustomObjectScript_112A::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0928::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0928::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { tOSIRISEVTCREATED *event_data = &data->evt_created; @@ -4448,7 +4448,7 @@ short CustomObjectScript_0928::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_29E9::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_29E9::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { tOSIRISEVTCREATED *event_data = &data->evt_created; @@ -4466,7 +4466,7 @@ short CustomObjectScript_29E9::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -4484,7 +4484,7 @@ short TriggerScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_000B::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_000B::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -4502,7 +4502,7 @@ short TriggerScript_000B::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0005::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0005::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -4520,7 +4520,7 @@ short TriggerScript_0005::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_000C::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_000C::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -4538,7 +4538,7 @@ short TriggerScript_000C::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0002::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0002::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -4559,7 +4559,7 @@ short TriggerScript_0002::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0004::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0004::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -4579,7 +4579,7 @@ short TriggerScript_0004::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0009::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0009::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -4597,7 +4597,7 @@ short TriggerScript_0009::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_000A::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_000A::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -4615,7 +4615,7 @@ short TriggerScript_000A::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0006::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0006::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -4634,7 +4634,7 @@ short TriggerScript_0006::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0028::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0028::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -4652,7 +4652,7 @@ short TriggerScript_0028::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0026::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0026::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -4670,7 +4670,7 @@ short TriggerScript_0026::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0023::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0023::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -4688,7 +4688,7 @@ short TriggerScript_0023::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0021::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0021::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -4706,7 +4706,7 @@ short TriggerScript_0021::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0020::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0020::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -4724,7 +4724,7 @@ short TriggerScript_0020::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_001D::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_001D::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -4742,7 +4742,7 @@ short TriggerScript_001D::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_001C::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_001C::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -4760,7 +4760,7 @@ short TriggerScript_001C::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0019::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0019::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -4778,7 +4778,7 @@ short TriggerScript_0019::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0018::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0018::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -4796,7 +4796,7 @@ short TriggerScript_0018::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0015::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0015::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -4814,7 +4814,7 @@ short TriggerScript_0015::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0010::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0010::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -4832,7 +4832,7 @@ short TriggerScript_0010::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_000E::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_000E::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -4850,7 +4850,7 @@ short TriggerScript_000E::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0013::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0013::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -4868,7 +4868,7 @@ short TriggerScript_0013::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0012::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0012::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -4886,7 +4886,7 @@ short TriggerScript_0012::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_000F::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_000F::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -4904,7 +4904,7 @@ short TriggerScript_000F::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_000D::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_000D::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -4922,7 +4922,7 @@ short TriggerScript_000D::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0027::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0027::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -4940,7 +4940,7 @@ short TriggerScript_0027::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0025::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0025::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -4958,7 +4958,7 @@ short TriggerScript_0025::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0024::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0024::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -4976,7 +4976,7 @@ short TriggerScript_0024::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0022::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0022::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -4994,7 +4994,7 @@ short TriggerScript_0022::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_001F::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_001F::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5012,7 +5012,7 @@ short TriggerScript_001F::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0016::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0016::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5030,7 +5030,7 @@ short TriggerScript_0016::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_001E::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_001E::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5048,7 +5048,7 @@ short TriggerScript_001E::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_001B::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_001B::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5066,7 +5066,7 @@ short TriggerScript_001B::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_001A::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_001A::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5084,7 +5084,7 @@ short TriggerScript_001A::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0017::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0017::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5102,7 +5102,7 @@ short TriggerScript_0017::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0014::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0014::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5120,7 +5120,7 @@ short TriggerScript_0014::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0011::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0011::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5138,7 +5138,7 @@ short TriggerScript_0011::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0029::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0029::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5159,7 +5159,7 @@ short TriggerScript_0029::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_002A::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_002A::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5177,7 +5177,7 @@ short TriggerScript_002A::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_002B::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_002B::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; diff --git a/scripts/level14.cpp b/scripts/level14.cpp index a4c23ab3..8d238d0c 100644 --- a/scripts/level14.cpp +++ b/scripts/level14.cpp @@ -40,7 +40,7 @@ DLLEXPORT void STDCALL ShutdownDLL(void); DLLEXPORT int STDCALL GetGOScriptID(const char *name, uint8_t is_door); DLLEXPORT void STDCALLPTR CreateInstance(int id); DLLEXPORT void STDCALL DestroyInstance(int id, void *ptr); -DLLEXPORT short STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data); +DLLEXPORT int16_t STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data); DLLEXPORT int STDCALL GetTriggerScriptID(int trigger_room, int trigger_face); DLLEXPORT int STDCALL GetCOScriptList(int **list, int **id_list); DLLEXPORT int STDCALL SaveRestoreState(void *file_ptr, uint8_t saving_state); @@ -109,242 +109,242 @@ class BaseScript { public: BaseScript(); ~BaseScript(); - virtual short CallEvent(int event, tOSIRISEventInfo *data); + virtual int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class LevelScript_0000 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_10B8 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0892 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0891 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0890 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_08A8 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_08A7 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_180F : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_1081 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_186D : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_08D3 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_188F : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0888 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_204F : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_2870 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_1025 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_08A0 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_189E : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_109B : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_109D : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_409A : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_309C : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_1083 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_088A : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_188B : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_088C : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_088D : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_088E : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_2880 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_10C3 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_4089 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_406F : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_1082 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_10D5 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_10D4 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_10D6 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0917 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_10D7 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0009 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0007 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0001 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0005 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0003 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0008 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0006 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0004 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0002 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; // ====================== @@ -1609,7 +1609,7 @@ void STDCALL DestroyInstance(int id, void *ptr) { // =================== // CallInstanceEvent() // =================== -short STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data) { +int16_t STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data) { switch (id) { case ID_LEVEL_0000: case ID_CUSTOM_OBJECT_10B8: @@ -1774,12 +1774,12 @@ BaseScript::BaseScript() {} BaseScript::~BaseScript() {} -short BaseScript::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t BaseScript::CallEvent(int event, tOSIRISEventInfo *data) { mprintf(0, "BaseScript::CallEvent()\n"); return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_SAVESTATE: { tOSIRISEVTSAVESTATE *event_data = &data->evt_savestate; @@ -2214,7 +2214,7 @@ short LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_10B8::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_10B8::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -2293,7 +2293,7 @@ short CustomObjectScript_10B8::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0892::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0892::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { tOSIRISEVTCREATED *event_data = &data->evt_created; @@ -2312,7 +2312,7 @@ short CustomObjectScript_0892::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0891::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0891::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { tOSIRISEVTCREATED *event_data = &data->evt_created; @@ -2331,7 +2331,7 @@ short CustomObjectScript_0891::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0890::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0890::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { tOSIRISEVTCREATED *event_data = &data->evt_created; @@ -2350,7 +2350,7 @@ short CustomObjectScript_0890::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_08A8::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_08A8::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -2386,7 +2386,7 @@ short CustomObjectScript_08A8::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_08A7::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_08A7::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -2422,7 +2422,7 @@ short CustomObjectScript_08A7::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_180F::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_180F::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -2458,7 +2458,7 @@ short CustomObjectScript_180F::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_1081::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_1081::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -2484,7 +2484,7 @@ short CustomObjectScript_1081::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_186D::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_186D::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -2510,7 +2510,7 @@ short CustomObjectScript_186D::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_08D3::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_08D3::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -2536,7 +2536,7 @@ short CustomObjectScript_08D3::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_188F::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_188F::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -2558,7 +2558,7 @@ short CustomObjectScript_188F::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0888::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0888::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -2594,7 +2594,7 @@ short CustomObjectScript_0888::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_204F::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_204F::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -2630,7 +2630,7 @@ short CustomObjectScript_204F::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_2870::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_2870::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -2666,7 +2666,7 @@ short CustomObjectScript_2870::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_1025::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_1025::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -2713,7 +2713,7 @@ short CustomObjectScript_1025::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_08A0::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_08A0::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -2745,7 +2745,7 @@ short CustomObjectScript_08A0::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_189E::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_189E::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -2777,7 +2777,7 @@ short CustomObjectScript_189E::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_109B::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_109B::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -2809,7 +2809,7 @@ short CustomObjectScript_109B::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_109D::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_109D::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -2841,7 +2841,7 @@ short CustomObjectScript_109D::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_409A::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_409A::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -2873,7 +2873,7 @@ short CustomObjectScript_409A::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_309C::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_309C::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -2901,7 +2901,7 @@ short CustomObjectScript_309C::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_1083::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_1083::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -2951,7 +2951,7 @@ short CustomObjectScript_1083::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_088A::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_088A::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3001,7 +3001,7 @@ short CustomObjectScript_088A::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_188B::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_188B::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3051,7 +3051,7 @@ short CustomObjectScript_188B::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_088C::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_088C::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3101,7 +3101,7 @@ short CustomObjectScript_088C::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_088D::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_088D::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3151,7 +3151,7 @@ short CustomObjectScript_088D::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_088E::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_088E::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3201,7 +3201,7 @@ short CustomObjectScript_088E::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_2880::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_2880::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_AIN_GOALCOMPLETE: { tOSIRISEVTAINOTIFY *event_data = &data->evt_ain_goalcomplete; @@ -3236,7 +3236,7 @@ short CustomObjectScript_2880::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_10C3::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_10C3::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3258,7 +3258,7 @@ short CustomObjectScript_10C3::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_4089::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_4089::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3313,7 +3313,7 @@ short CustomObjectScript_4089::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_406F::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_406F::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3364,7 +3364,7 @@ short CustomObjectScript_406F::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_1082::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_1082::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3384,7 +3384,7 @@ short CustomObjectScript_1082::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_10D5::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_10D5::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3404,7 +3404,7 @@ short CustomObjectScript_10D5::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_10D4::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_10D4::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3424,7 +3424,7 @@ short CustomObjectScript_10D4::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_10D6::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_10D6::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3444,7 +3444,7 @@ short CustomObjectScript_10D6::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0917::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0917::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3464,7 +3464,7 @@ short CustomObjectScript_0917::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_10D7::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_10D7::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3484,7 +3484,7 @@ short CustomObjectScript_10D7::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0009::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0009::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3502,7 +3502,7 @@ short TriggerScript_0009::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0007::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0007::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3520,7 +3520,7 @@ short TriggerScript_0007::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0001::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0001::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3538,7 +3538,7 @@ short TriggerScript_0001::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0005::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0005::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3556,7 +3556,7 @@ short TriggerScript_0005::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0003::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0003::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3574,7 +3574,7 @@ short TriggerScript_0003::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0008::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0008::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3592,7 +3592,7 @@ short TriggerScript_0008::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0006::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0006::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3610,7 +3610,7 @@ short TriggerScript_0006::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0004::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0004::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3628,7 +3628,7 @@ short TriggerScript_0004::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0002::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0002::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; diff --git a/scripts/level17.cpp b/scripts/level17.cpp index 2d39e333..b9fe7c52 100644 --- a/scripts/level17.cpp +++ b/scripts/level17.cpp @@ -40,7 +40,7 @@ DLLEXPORT void STDCALL ShutdownDLL(void); DLLEXPORT int STDCALL GetGOScriptID(const char *name, uint8_t is_door); DLLEXPORT void STDCALLPTR CreateInstance(int id); DLLEXPORT void STDCALL DestroyInstance(int id, void *ptr); -DLLEXPORT short STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data); +DLLEXPORT int16_t STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data); DLLEXPORT int STDCALL GetTriggerScriptID(int trigger_room, int trigger_face); DLLEXPORT int STDCALL GetCOScriptList(int **list, int **id_list); DLLEXPORT int STDCALL SaveRestoreState(void *file_ptr, uint8_t saving_state); @@ -195,672 +195,672 @@ class BaseScript { public: BaseScript(); ~BaseScript(); - virtual short CallEvent(int event, tOSIRISEventInfo *data); + virtual int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class LevelScript_0000 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0821 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0820 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_181E : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_081F : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0814 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0815 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0816 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0818 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0819 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0817 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_1024 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0826 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0828 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0827 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_086A : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_086B : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_1025 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0829 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0809 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0808 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_1007 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_1006 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0805 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_1004 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_1003 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_100E : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0845 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0844 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0843 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0842 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0841 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0840 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_083F : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_083E : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_083D : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_083C : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_083B : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_083A : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0851 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0850 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_084F : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_084E : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_084D : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_084C : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_084B : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_084A : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0849 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0848 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0847 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0846 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_085D : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_085C : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_085B : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_085A : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0859 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0858 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0857 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0856 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0855 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0854 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0853 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0852 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0869 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0868 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0867 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0866 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0865 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0864 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0863 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0862 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0861 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0860 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_085F : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_085E : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_003B : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_003A : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0035 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0034 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0031 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_002F : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_002E : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0023 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0022 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0021 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0020 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_001B : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_001A : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0017 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0016 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0015 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0014 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0013 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0012 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0011 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0010 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_000B : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_000A : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0009 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0008 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0005 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0004 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0001 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0000 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_003D : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_003C : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0039 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0038 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0037 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0036 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0033 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0032 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0030 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_002C : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0027 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0026 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0025 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0024 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_001F : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_001E : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_001D : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_001C : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0019 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0018 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_000F : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_000E : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_000D : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_000C : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0007 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0006 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0003 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0002 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0040 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; // ====================== @@ -2746,7 +2746,7 @@ void STDCALL DestroyInstance(int id, void *ptr) { // =================== // CallInstanceEvent() // =================== -short STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data) { +int16_t STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data) { switch (id) { case ID_LEVEL_0000: case ID_CUSTOM_OBJECT_0821: @@ -3188,12 +3188,12 @@ BaseScript::BaseScript() {} BaseScript::~BaseScript() {} -short BaseScript::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t BaseScript::CallEvent(int event, tOSIRISEventInfo *data) { mprintf(0, "BaseScript::CallEvent()\n"); return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_SAVESTATE: { tOSIRISEVTSAVESTATE *event_data = &data->evt_savestate; @@ -3361,7 +3361,7 @@ short LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0821::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0821::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3383,7 +3383,7 @@ short CustomObjectScript_0821::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0820::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0820::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3405,7 +3405,7 @@ short CustomObjectScript_0820::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_181E::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_181E::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3427,7 +3427,7 @@ short CustomObjectScript_181E::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_081F::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_081F::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3449,7 +3449,7 @@ short CustomObjectScript_081F::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0814::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0814::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_DESTROY: { tOSIRISEVTDESTROY *event_data = &data->evt_destroy; @@ -3471,7 +3471,7 @@ short CustomObjectScript_0814::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0815::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0815::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_DESTROY: { tOSIRISEVTDESTROY *event_data = &data->evt_destroy; @@ -3493,7 +3493,7 @@ short CustomObjectScript_0815::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0816::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0816::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -3533,7 +3533,7 @@ short CustomObjectScript_0816::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0818::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0818::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_DESTROY: { tOSIRISEVTDESTROY *event_data = &data->evt_destroy; @@ -3555,7 +3555,7 @@ short CustomObjectScript_0818::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0819::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0819::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_DESTROY: { tOSIRISEVTDESTROY *event_data = &data->evt_destroy; @@ -3577,7 +3577,7 @@ short CustomObjectScript_0819::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0817::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0817::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -3617,7 +3617,7 @@ short CustomObjectScript_0817::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_1024::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_1024::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3638,7 +3638,7 @@ short CustomObjectScript_1024::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0826::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0826::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3659,7 +3659,7 @@ short CustomObjectScript_0826::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0828::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0828::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_DESTROY: { tOSIRISEVTDESTROY *event_data = &data->evt_destroy; @@ -3684,7 +3684,7 @@ short CustomObjectScript_0828::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0827::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0827::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_DESTROY: { tOSIRISEVTDESTROY *event_data = &data->evt_destroy; @@ -3709,7 +3709,7 @@ short CustomObjectScript_0827::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_086A::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_086A::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -3738,7 +3738,7 @@ short CustomObjectScript_086A::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_086B::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_086B::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -3767,7 +3767,7 @@ short CustomObjectScript_086B::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_1025::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_1025::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_DESTROY: { tOSIRISEVTDESTROY *event_data = &data->evt_destroy; @@ -3811,7 +3811,7 @@ short CustomObjectScript_1025::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0829::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0829::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -3830,7 +3830,7 @@ short CustomObjectScript_0829::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0809::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0809::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -3868,7 +3868,7 @@ short CustomObjectScript_0809::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0808::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0808::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -3906,7 +3906,7 @@ short CustomObjectScript_0808::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_1007::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_1007::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -3944,7 +3944,7 @@ short CustomObjectScript_1007::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_1006::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_1006::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -3982,7 +3982,7 @@ short CustomObjectScript_1006::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0805::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0805::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -4020,7 +4020,7 @@ short CustomObjectScript_0805::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_1004::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_1004::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -4044,7 +4044,7 @@ short CustomObjectScript_1004::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_1003::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_1003::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -4068,7 +4068,7 @@ short CustomObjectScript_1003::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_100E::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_100E::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -4092,7 +4092,7 @@ short CustomObjectScript_100E::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0845::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0845::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -4110,7 +4110,7 @@ short CustomObjectScript_0845::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0844::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0844::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -4128,7 +4128,7 @@ short CustomObjectScript_0844::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0843::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0843::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -4146,7 +4146,7 @@ short CustomObjectScript_0843::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0842::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0842::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -4164,7 +4164,7 @@ short CustomObjectScript_0842::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0841::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0841::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -4182,7 +4182,7 @@ short CustomObjectScript_0841::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0840::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0840::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -4200,7 +4200,7 @@ short CustomObjectScript_0840::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_083F::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_083F::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -4218,7 +4218,7 @@ short CustomObjectScript_083F::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_083E::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_083E::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -4236,7 +4236,7 @@ short CustomObjectScript_083E::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_083D::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_083D::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -4254,7 +4254,7 @@ short CustomObjectScript_083D::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_083C::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_083C::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -4272,7 +4272,7 @@ short CustomObjectScript_083C::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_083B::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_083B::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -4290,7 +4290,7 @@ short CustomObjectScript_083B::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_083A::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_083A::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -4308,7 +4308,7 @@ short CustomObjectScript_083A::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0851::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0851::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -4326,7 +4326,7 @@ short CustomObjectScript_0851::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0850::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0850::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -4344,7 +4344,7 @@ short CustomObjectScript_0850::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_084F::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_084F::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -4362,7 +4362,7 @@ short CustomObjectScript_084F::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_084E::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_084E::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -4380,7 +4380,7 @@ short CustomObjectScript_084E::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_084D::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_084D::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -4398,7 +4398,7 @@ short CustomObjectScript_084D::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_084C::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_084C::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -4416,7 +4416,7 @@ short CustomObjectScript_084C::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_084B::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_084B::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -4434,7 +4434,7 @@ short CustomObjectScript_084B::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_084A::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_084A::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -4452,7 +4452,7 @@ short CustomObjectScript_084A::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0849::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0849::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -4470,7 +4470,7 @@ short CustomObjectScript_0849::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0848::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0848::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -4488,7 +4488,7 @@ short CustomObjectScript_0848::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0847::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0847::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -4506,7 +4506,7 @@ short CustomObjectScript_0847::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0846::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0846::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -4524,7 +4524,7 @@ short CustomObjectScript_0846::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_085D::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_085D::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -4542,7 +4542,7 @@ short CustomObjectScript_085D::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_085C::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_085C::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -4560,7 +4560,7 @@ short CustomObjectScript_085C::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_085B::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_085B::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -4578,7 +4578,7 @@ short CustomObjectScript_085B::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_085A::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_085A::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -4596,7 +4596,7 @@ short CustomObjectScript_085A::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0859::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0859::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -4614,7 +4614,7 @@ short CustomObjectScript_0859::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0858::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0858::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -4632,7 +4632,7 @@ short CustomObjectScript_0858::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0857::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0857::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -4650,7 +4650,7 @@ short CustomObjectScript_0857::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0856::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0856::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -4668,7 +4668,7 @@ short CustomObjectScript_0856::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0855::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0855::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -4686,7 +4686,7 @@ short CustomObjectScript_0855::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0854::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0854::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -4704,7 +4704,7 @@ short CustomObjectScript_0854::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0853::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0853::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -4722,7 +4722,7 @@ short CustomObjectScript_0853::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0852::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0852::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -4740,7 +4740,7 @@ short CustomObjectScript_0852::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0869::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0869::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -4758,7 +4758,7 @@ short CustomObjectScript_0869::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0868::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0868::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -4776,7 +4776,7 @@ short CustomObjectScript_0868::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0867::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0867::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -4794,7 +4794,7 @@ short CustomObjectScript_0867::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0866::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0866::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -4812,7 +4812,7 @@ short CustomObjectScript_0866::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0865::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0865::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -4830,7 +4830,7 @@ short CustomObjectScript_0865::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0864::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0864::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -4848,7 +4848,7 @@ short CustomObjectScript_0864::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0863::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0863::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -4866,7 +4866,7 @@ short CustomObjectScript_0863::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0862::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0862::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -4884,7 +4884,7 @@ short CustomObjectScript_0862::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0861::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0861::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -4902,7 +4902,7 @@ short CustomObjectScript_0861::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0860::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0860::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -4920,7 +4920,7 @@ short CustomObjectScript_0860::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_085F::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_085F::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -4938,7 +4938,7 @@ short CustomObjectScript_085F::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_085E::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_085E::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -4956,7 +4956,7 @@ short CustomObjectScript_085E::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_003B::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_003B::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -4975,7 +4975,7 @@ short TriggerScript_003B::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_003A::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_003A::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -4994,7 +4994,7 @@ short TriggerScript_003A::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0035::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0035::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5013,7 +5013,7 @@ short TriggerScript_0035::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0034::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0034::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5032,7 +5032,7 @@ short TriggerScript_0034::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0031::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0031::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5051,7 +5051,7 @@ short TriggerScript_0031::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_002F::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_002F::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5070,7 +5070,7 @@ short TriggerScript_002F::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_002E::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_002E::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5089,7 +5089,7 @@ short TriggerScript_002E::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0023::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0023::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5108,7 +5108,7 @@ short TriggerScript_0023::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0022::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0022::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5127,7 +5127,7 @@ short TriggerScript_0022::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0021::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0021::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5146,7 +5146,7 @@ short TriggerScript_0021::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0020::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0020::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5165,7 +5165,7 @@ short TriggerScript_0020::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_001B::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_001B::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5184,7 +5184,7 @@ short TriggerScript_001B::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_001A::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_001A::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5203,7 +5203,7 @@ short TriggerScript_001A::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0017::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0017::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5222,7 +5222,7 @@ short TriggerScript_0017::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0016::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0016::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5241,7 +5241,7 @@ short TriggerScript_0016::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0015::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0015::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5260,7 +5260,7 @@ short TriggerScript_0015::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0014::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0014::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5279,7 +5279,7 @@ short TriggerScript_0014::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0013::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0013::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5298,7 +5298,7 @@ short TriggerScript_0013::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0012::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0012::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5317,7 +5317,7 @@ short TriggerScript_0012::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0011::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0011::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5336,7 +5336,7 @@ short TriggerScript_0011::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0010::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0010::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5355,7 +5355,7 @@ short TriggerScript_0010::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_000B::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_000B::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5374,7 +5374,7 @@ short TriggerScript_000B::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_000A::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_000A::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5393,7 +5393,7 @@ short TriggerScript_000A::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0009::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0009::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5412,7 +5412,7 @@ short TriggerScript_0009::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0008::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0008::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5431,7 +5431,7 @@ short TriggerScript_0008::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0005::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0005::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5450,7 +5450,7 @@ short TriggerScript_0005::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0004::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0004::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5469,7 +5469,7 @@ short TriggerScript_0004::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0001::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0001::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5488,7 +5488,7 @@ short TriggerScript_0001::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5507,7 +5507,7 @@ short TriggerScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_003D::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_003D::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5526,7 +5526,7 @@ short TriggerScript_003D::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_003C::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_003C::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5545,7 +5545,7 @@ short TriggerScript_003C::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0039::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0039::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5564,7 +5564,7 @@ short TriggerScript_0039::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0038::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0038::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5583,7 +5583,7 @@ short TriggerScript_0038::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0037::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0037::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5602,7 +5602,7 @@ short TriggerScript_0037::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0036::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0036::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5621,7 +5621,7 @@ short TriggerScript_0036::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0033::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0033::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5640,7 +5640,7 @@ short TriggerScript_0033::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0032::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0032::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5659,7 +5659,7 @@ short TriggerScript_0032::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0030::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0030::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5678,7 +5678,7 @@ short TriggerScript_0030::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_002C::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_002C::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5698,7 +5698,7 @@ short TriggerScript_002C::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0027::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0027::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5717,7 +5717,7 @@ short TriggerScript_0027::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0026::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0026::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5736,7 +5736,7 @@ short TriggerScript_0026::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0025::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0025::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5755,7 +5755,7 @@ short TriggerScript_0025::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0024::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0024::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5774,7 +5774,7 @@ short TriggerScript_0024::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_001F::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_001F::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5793,7 +5793,7 @@ short TriggerScript_001F::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_001E::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_001E::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5812,7 +5812,7 @@ short TriggerScript_001E::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_001D::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_001D::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5831,7 +5831,7 @@ short TriggerScript_001D::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_001C::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_001C::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5850,7 +5850,7 @@ short TriggerScript_001C::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0019::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0019::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5869,7 +5869,7 @@ short TriggerScript_0019::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0018::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0018::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5888,7 +5888,7 @@ short TriggerScript_0018::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_000F::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_000F::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5907,7 +5907,7 @@ short TriggerScript_000F::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_000E::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_000E::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5926,7 +5926,7 @@ short TriggerScript_000E::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_000D::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_000D::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5945,7 +5945,7 @@ short TriggerScript_000D::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_000C::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_000C::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5964,7 +5964,7 @@ short TriggerScript_000C::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0007::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0007::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5983,7 +5983,7 @@ short TriggerScript_0007::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0006::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0006::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -6002,7 +6002,7 @@ short TriggerScript_0006::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0003::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0003::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -6021,7 +6021,7 @@ short TriggerScript_0003::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0002::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0002::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -6040,7 +6040,7 @@ short TriggerScript_0002::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0040::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0040::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; diff --git a/scripts/level2.cpp b/scripts/level2.cpp index 9627ca9e..03d7cd86 100644 --- a/scripts/level2.cpp +++ b/scripts/level2.cpp @@ -40,7 +40,7 @@ DLLEXPORT void STDCALL ShutdownDLL(void); DLLEXPORT int STDCALL GetGOScriptID(const char *name, uint8_t is_door); DLLEXPORT void STDCALLPTR CreateInstance(int id); DLLEXPORT void STDCALL DestroyInstance(int id, void *ptr); -DLLEXPORT short STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data); +DLLEXPORT int16_t STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data); DLLEXPORT int STDCALL GetTriggerScriptID(int trigger_room, int trigger_face); DLLEXPORT int STDCALL GetCOScriptList(int **list, int **id_list); DLLEXPORT int STDCALL SaveRestoreState(void *file_ptr, uint8_t saving_state); @@ -129,342 +129,342 @@ class BaseScript { public: BaseScript(); ~BaseScript(); - virtual short CallEvent(int event, tOSIRISEventInfo *data); + virtual int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class LevelScript_0000 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_082D : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_082E : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_082F : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0830 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0831 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_2112 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_11F2 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_11F4 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_11F6 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_19F7 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_11FB : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_1211 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0885 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_080D : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_09EC : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_11EB : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_19E9 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_19E8 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_19EA : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_09E7 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_09E6 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_11BB : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_09BC : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_09BD : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_09BE : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_11BF : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_09C0 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_11C1 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_11BA : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_09C9 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_09C8 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_09C7 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_09C6 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_09C5 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_09C4 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_09C3 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_09C2 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_094E : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0000 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0001 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0002 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0004 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0005 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0003 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0008 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0006 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_000C : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_000B : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0007 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_000E : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_000A : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0009 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0010 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_000D : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0014 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0011 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_000F : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0016 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0013 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0017 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0018 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0015 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0012 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0020 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_001F : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_001E : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; // ====================== @@ -1931,7 +1931,7 @@ void STDCALL DestroyInstance(int id, void *ptr) { // =================== // CallInstanceEvent() // =================== -short STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data) { +int16_t STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data) { switch (id) { case ID_LEVEL_0000: case ID_CUSTOM_OBJECT_082D: @@ -2174,12 +2174,12 @@ BaseScript::BaseScript() {} BaseScript::~BaseScript() {} -short BaseScript::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t BaseScript::CallEvent(int event, tOSIRISEventInfo *data) { mprintf(0, "BaseScript::CallEvent()\n"); return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_SAVESTATE: { tOSIRISEVTSAVESTATE *event_data = &data->evt_savestate; @@ -2835,7 +2835,7 @@ short LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_082D::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_082D::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_DESTROY: { tOSIRISEVTDESTROY *event_data = &data->evt_destroy; @@ -2871,7 +2871,7 @@ short CustomObjectScript_082D::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_082E::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_082E::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_DESTROY: { tOSIRISEVTDESTROY *event_data = &data->evt_destroy; @@ -2907,7 +2907,7 @@ short CustomObjectScript_082E::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_082F::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_082F::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_DESTROY: { tOSIRISEVTDESTROY *event_data = &data->evt_destroy; @@ -2943,7 +2943,7 @@ short CustomObjectScript_082F::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0830::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0830::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_DESTROY: { tOSIRISEVTDESTROY *event_data = &data->evt_destroy; @@ -2979,7 +2979,7 @@ short CustomObjectScript_0830::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0831::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0831::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_DESTROY: { tOSIRISEVTDESTROY *event_data = &data->evt_destroy; @@ -3015,7 +3015,7 @@ short CustomObjectScript_0831::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_2112::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_2112::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3049,7 +3049,7 @@ short CustomObjectScript_2112::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_11F2::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_11F2::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_AIN_MOVIE_END: { tOSIRISEVTAINOTIFY *event_data = &data->evt_ain_movie_end; @@ -3073,7 +3073,7 @@ short CustomObjectScript_11F2::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_11F4::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_11F4::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_AIN_MOVIE_END: { tOSIRISEVTAINOTIFY *event_data = &data->evt_ain_movie_end; @@ -3096,7 +3096,7 @@ short CustomObjectScript_11F4::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_11F6::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_11F6::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_AIN_MOVIE_END: { tOSIRISEVTAINOTIFY *event_data = &data->evt_ain_movie_end; @@ -3119,7 +3119,7 @@ short CustomObjectScript_11F6::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_19F7::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_19F7::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_AIN_MOVIE_END: { tOSIRISEVTAINOTIFY *event_data = &data->evt_ain_movie_end; @@ -3140,7 +3140,7 @@ short CustomObjectScript_19F7::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_11FB::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_11FB::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_AIN_GOALCOMPLETE: { tOSIRISEVTAINOTIFY *event_data = &data->evt_ain_goalcomplete; @@ -3158,7 +3158,7 @@ short CustomObjectScript_11FB::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_1211::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_1211::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_AIN_MOVIE_END: { tOSIRISEVTAINOTIFY *event_data = &data->evt_ain_movie_end; @@ -3178,7 +3178,7 @@ short CustomObjectScript_1211::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0885::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0885::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3253,7 +3253,7 @@ short CustomObjectScript_0885::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_080D::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_080D::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -3273,7 +3273,7 @@ short CustomObjectScript_080D::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_09EC::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_09EC::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3299,7 +3299,7 @@ short CustomObjectScript_09EC::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_11EB::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_11EB::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3381,7 +3381,7 @@ short CustomObjectScript_11EB::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_19E9::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_19E9::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3474,7 +3474,7 @@ short CustomObjectScript_19E9::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_19E8::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_19E8::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3522,7 +3522,7 @@ short CustomObjectScript_19E8::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_19EA::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_19EA::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3569,7 +3569,7 @@ short CustomObjectScript_19EA::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_09E7::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_09E7::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3598,7 +3598,7 @@ short CustomObjectScript_09E7::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_09E6::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_09E6::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3629,7 +3629,7 @@ short CustomObjectScript_09E6::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_11BB::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_11BB::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_DESTROY: { tOSIRISEVTDESTROY *event_data = &data->evt_destroy; @@ -3660,7 +3660,7 @@ short CustomObjectScript_11BB::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_09BC::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_09BC::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_DESTROY: { tOSIRISEVTDESTROY *event_data = &data->evt_destroy; @@ -3691,7 +3691,7 @@ short CustomObjectScript_09BC::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_09BD::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_09BD::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_DESTROY: { tOSIRISEVTDESTROY *event_data = &data->evt_destroy; @@ -3722,7 +3722,7 @@ short CustomObjectScript_09BD::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_09BE::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_09BE::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_DESTROY: { tOSIRISEVTDESTROY *event_data = &data->evt_destroy; @@ -3753,7 +3753,7 @@ short CustomObjectScript_09BE::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_11BF::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_11BF::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_DESTROY: { tOSIRISEVTDESTROY *event_data = &data->evt_destroy; @@ -3784,7 +3784,7 @@ short CustomObjectScript_11BF::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_09C0::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_09C0::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_DESTROY: { tOSIRISEVTDESTROY *event_data = &data->evt_destroy; @@ -3815,7 +3815,7 @@ short CustomObjectScript_09C0::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_11C1::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_11C1::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_DESTROY: { tOSIRISEVTDESTROY *event_data = &data->evt_destroy; @@ -3846,7 +3846,7 @@ short CustomObjectScript_11C1::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_11BA::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_11BA::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_DESTROY: { tOSIRISEVTDESTROY *event_data = &data->evt_destroy; @@ -3877,7 +3877,7 @@ short CustomObjectScript_11BA::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_09C9::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_09C9::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_DESTROY: { tOSIRISEVTDESTROY *event_data = &data->evt_destroy; @@ -3908,7 +3908,7 @@ short CustomObjectScript_09C9::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_09C8::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_09C8::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_DESTROY: { tOSIRISEVTDESTROY *event_data = &data->evt_destroy; @@ -3939,7 +3939,7 @@ short CustomObjectScript_09C8::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_09C7::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_09C7::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_DESTROY: { tOSIRISEVTDESTROY *event_data = &data->evt_destroy; @@ -3970,7 +3970,7 @@ short CustomObjectScript_09C7::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_09C6::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_09C6::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_DESTROY: { tOSIRISEVTDESTROY *event_data = &data->evt_destroy; @@ -4001,7 +4001,7 @@ short CustomObjectScript_09C6::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_09C5::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_09C5::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_DESTROY: { tOSIRISEVTDESTROY *event_data = &data->evt_destroy; @@ -4032,7 +4032,7 @@ short CustomObjectScript_09C5::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_09C4::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_09C4::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_DESTROY: { tOSIRISEVTDESTROY *event_data = &data->evt_destroy; @@ -4063,7 +4063,7 @@ short CustomObjectScript_09C4::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_09C3::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_09C3::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_DESTROY: { tOSIRISEVTDESTROY *event_data = &data->evt_destroy; @@ -4094,7 +4094,7 @@ short CustomObjectScript_09C3::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_09C2::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_09C2::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_DESTROY: { tOSIRISEVTDESTROY *event_data = &data->evt_destroy; @@ -4125,7 +4125,7 @@ short CustomObjectScript_09C2::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_094E::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_094E::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_DESTROY: { tOSIRISEVTDESTROY *event_data = &data->evt_destroy; @@ -4155,7 +4155,7 @@ short CustomObjectScript_094E::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -4173,7 +4173,7 @@ short TriggerScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0001::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0001::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -4290,7 +4290,7 @@ short TriggerScript_0001::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0002::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0002::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -4308,7 +4308,7 @@ short TriggerScript_0002::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0004::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0004::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -4326,7 +4326,7 @@ short TriggerScript_0004::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0005::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0005::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -4344,7 +4344,7 @@ short TriggerScript_0005::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0003::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0003::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -4362,7 +4362,7 @@ short TriggerScript_0003::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0008::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0008::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -4380,7 +4380,7 @@ short TriggerScript_0008::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0006::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0006::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -4398,7 +4398,7 @@ short TriggerScript_0006::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_000C::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_000C::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -4416,7 +4416,7 @@ short TriggerScript_000C::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_000B::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_000B::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -4434,7 +4434,7 @@ short TriggerScript_000B::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0007::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0007::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -4452,7 +4452,7 @@ short TriggerScript_0007::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_000E::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_000E::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -4470,7 +4470,7 @@ short TriggerScript_000E::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_000A::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_000A::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -4488,7 +4488,7 @@ short TriggerScript_000A::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0009::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0009::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -4506,7 +4506,7 @@ short TriggerScript_0009::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0010::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0010::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -4524,7 +4524,7 @@ short TriggerScript_0010::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_000D::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_000D::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -4542,7 +4542,7 @@ short TriggerScript_000D::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0014::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0014::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -4560,7 +4560,7 @@ short TriggerScript_0014::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0011::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0011::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -4578,7 +4578,7 @@ short TriggerScript_0011::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_000F::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_000F::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -4596,7 +4596,7 @@ short TriggerScript_000F::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0016::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0016::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -4614,7 +4614,7 @@ short TriggerScript_0016::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0013::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0013::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -4632,7 +4632,7 @@ short TriggerScript_0013::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0017::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0017::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -4650,7 +4650,7 @@ short TriggerScript_0017::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0018::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0018::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -4668,7 +4668,7 @@ short TriggerScript_0018::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0015::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0015::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -4686,7 +4686,7 @@ short TriggerScript_0015::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0012::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0012::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -4704,7 +4704,7 @@ short TriggerScript_0012::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0020::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0020::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -4722,7 +4722,7 @@ short TriggerScript_0020::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_001F::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_001F::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -4740,7 +4740,7 @@ short TriggerScript_001F::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_001E::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_001E::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; diff --git a/scripts/level3.cpp b/scripts/level3.cpp index 31889a11..e8722874 100644 --- a/scripts/level3.cpp +++ b/scripts/level3.cpp @@ -40,7 +40,7 @@ DLLEXPORT void STDCALL ShutdownDLL(void); DLLEXPORT int STDCALL GetGOScriptID(const char *name, uint8_t is_door); DLLEXPORT void STDCALLPTR CreateInstance(int id); DLLEXPORT void STDCALL DestroyInstance(int id, void *ptr); -DLLEXPORT short STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data); +DLLEXPORT int16_t STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data); DLLEXPORT int STDCALL GetTriggerScriptID(int trigger_room, int trigger_face); DLLEXPORT int STDCALL GetCOScriptList(int **list, int **id_list); DLLEXPORT int STDCALL SaveRestoreState(void *file_ptr, uint8_t saving_state); @@ -126,327 +126,327 @@ class BaseScript { public: BaseScript(); ~BaseScript(); - virtual short CallEvent(int event, tOSIRISEventInfo *data); + virtual int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class LevelScript_0000 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_2109 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_1AE9 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_206D : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_117F : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_184A : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_4049 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0961 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0960 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_095F : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_095E : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_28D9 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_38E0 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_1995 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_11CB : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_20D7 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_30D8 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_20DC : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_28DA : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_11B7 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_21A7 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_11C9 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_21CA : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_202B : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_18D6 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_202D : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_21CD : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_182E : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_31CC : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_431E : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_1320 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_131F : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_131D : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_100C : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_18AD : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0003 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0002 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_000A : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0001 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0000 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_000B : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_000E : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_000D : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_000C : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0009 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0006 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0007 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0004 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0008 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0019 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0018 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0017 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0016 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0014 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0015 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0005 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0013 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0022 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0012 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0011 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_001A : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_001D : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_001C : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_001E : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; // ====================== @@ -1766,7 +1766,7 @@ void STDCALL DestroyInstance(int id, void *ptr) { // =================== // CallInstanceEvent() // =================== -short STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data) { +int16_t STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data) { switch (id) { case ID_LEVEL_0000: case ID_CUSTOM_OBJECT_2109: @@ -2004,12 +2004,12 @@ BaseScript::BaseScript() {} BaseScript::~BaseScript() {} -short BaseScript::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t BaseScript::CallEvent(int event, tOSIRISEventInfo *data) { mprintf(0, "BaseScript::CallEvent()\n"); return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_SAVESTATE: { tOSIRISEVTSAVESTATE *event_data = &data->evt_savestate; @@ -2357,7 +2357,7 @@ short LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_2109::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_2109::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -2378,7 +2378,7 @@ short CustomObjectScript_2109::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_1AE9::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_1AE9::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { tOSIRISEVTCREATED *event_data = &data->evt_created; @@ -2421,7 +2421,7 @@ short CustomObjectScript_1AE9::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_206D::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_206D::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -2446,7 +2446,7 @@ short CustomObjectScript_206D::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_117F::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_117F::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -2467,7 +2467,7 @@ short CustomObjectScript_117F::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_184A::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_184A::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -2495,7 +2495,7 @@ short CustomObjectScript_184A::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_4049::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_4049::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -2523,7 +2523,7 @@ short CustomObjectScript_4049::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0961::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0961::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -2575,7 +2575,7 @@ short CustomObjectScript_0961::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0960::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0960::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -2627,7 +2627,7 @@ short CustomObjectScript_0960::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_095F::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_095F::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -2679,7 +2679,7 @@ short CustomObjectScript_095F::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_095E::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_095E::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -2731,7 +2731,7 @@ short CustomObjectScript_095E::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_28D9::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_28D9::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -2780,7 +2780,7 @@ short CustomObjectScript_28D9::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_38E0::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_38E0::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -2829,7 +2829,7 @@ short CustomObjectScript_38E0::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_1995::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_1995::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -2878,7 +2878,7 @@ short CustomObjectScript_1995::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_11CB::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_11CB::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -2927,7 +2927,7 @@ short CustomObjectScript_11CB::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_20D7::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_20D7::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -2968,7 +2968,7 @@ short CustomObjectScript_20D7::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_30D8::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_30D8::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3021,7 +3021,7 @@ short CustomObjectScript_30D8::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_20DC::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_20DC::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3062,7 +3062,7 @@ short CustomObjectScript_20DC::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_28DA::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_28DA::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3115,7 +3115,7 @@ short CustomObjectScript_28DA::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_11B7::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_11B7::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3156,7 +3156,7 @@ short CustomObjectScript_11B7::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_21A7::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_21A7::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3209,7 +3209,7 @@ short CustomObjectScript_21A7::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_11C9::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_11C9::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3250,7 +3250,7 @@ short CustomObjectScript_11C9::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_21CA::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_21CA::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3303,7 +3303,7 @@ short CustomObjectScript_21CA::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_202B::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_202B::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3343,7 +3343,7 @@ short CustomObjectScript_202B::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_18D6::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_18D6::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3364,7 +3364,7 @@ short CustomObjectScript_18D6::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_202D::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_202D::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_DESTROY: { tOSIRISEVTDESTROY *event_data = &data->evt_destroy; @@ -3402,7 +3402,7 @@ short CustomObjectScript_202D::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_21CD::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_21CD::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3434,7 +3434,7 @@ short CustomObjectScript_21CD::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_182E::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_182E::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3471,7 +3471,7 @@ short CustomObjectScript_182E::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_31CC::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_31CC::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3519,7 +3519,7 @@ short CustomObjectScript_31CC::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_431E::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_431E::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { tOSIRISEVTCREATED *event_data = &data->evt_created; @@ -3539,7 +3539,7 @@ short CustomObjectScript_431E::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_1320::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_1320::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { tOSIRISEVTCREATED *event_data = &data->evt_created; @@ -3559,7 +3559,7 @@ short CustomObjectScript_1320::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_131F::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_131F::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { tOSIRISEVTCREATED *event_data = &data->evt_created; @@ -3579,7 +3579,7 @@ short CustomObjectScript_131F::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_131D::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_131D::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { tOSIRISEVTCREATED *event_data = &data->evt_created; @@ -3599,7 +3599,7 @@ short CustomObjectScript_131D::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_100C::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_100C::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3621,7 +3621,7 @@ short CustomObjectScript_100C::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_18AD::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_18AD::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_DESTROY: { tOSIRISEVTDESTROY *event_data = &data->evt_destroy; @@ -3643,7 +3643,7 @@ short CustomObjectScript_18AD::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0003::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0003::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3670,7 +3670,7 @@ short TriggerScript_0003::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0002::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0002::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3697,7 +3697,7 @@ short TriggerScript_0002::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_000A::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_000A::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3715,7 +3715,7 @@ short TriggerScript_000A::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0001::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0001::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3733,7 +3733,7 @@ short TriggerScript_0001::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3751,7 +3751,7 @@ short TriggerScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_000B::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_000B::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3769,7 +3769,7 @@ short TriggerScript_000B::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_000E::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_000E::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3787,7 +3787,7 @@ short TriggerScript_000E::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_000D::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_000D::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3804,7 +3804,7 @@ short TriggerScript_000D::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_000C::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_000C::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3822,7 +3822,7 @@ short TriggerScript_000C::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0009::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0009::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3840,7 +3840,7 @@ short TriggerScript_0009::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0006::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0006::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3867,7 +3867,7 @@ short TriggerScript_0006::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0007::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0007::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3885,7 +3885,7 @@ short TriggerScript_0007::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0004::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0004::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3903,7 +3903,7 @@ short TriggerScript_0004::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0008::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0008::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3920,7 +3920,7 @@ short TriggerScript_0008::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0019::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0019::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3938,7 +3938,7 @@ short TriggerScript_0019::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0018::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0018::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3956,7 +3956,7 @@ short TriggerScript_0018::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0017::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0017::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3974,7 +3974,7 @@ short TriggerScript_0017::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0016::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0016::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3992,7 +3992,7 @@ short TriggerScript_0016::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0014::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0014::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -4010,7 +4010,7 @@ short TriggerScript_0014::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0015::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0015::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -4028,7 +4028,7 @@ short TriggerScript_0015::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0005::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0005::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -4046,7 +4046,7 @@ short TriggerScript_0005::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0013::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0013::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -4064,7 +4064,7 @@ short TriggerScript_0013::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0022::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0022::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -4082,7 +4082,7 @@ short TriggerScript_0022::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0012::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0012::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -4100,7 +4100,7 @@ short TriggerScript_0012::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0011::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0011::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -4118,7 +4118,7 @@ short TriggerScript_0011::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_001A::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_001A::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -4136,7 +4136,7 @@ short TriggerScript_001A::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_001D::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_001D::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -4154,7 +4154,7 @@ short TriggerScript_001D::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_001C::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_001C::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -4184,7 +4184,7 @@ short TriggerScript_001C::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_001E::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_001E::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; diff --git a/scripts/level4.cpp b/scripts/level4.cpp index 15ccd236..032ec6ac 100644 --- a/scripts/level4.cpp +++ b/scripts/level4.cpp @@ -40,7 +40,7 @@ DLLEXPORT void STDCALL ShutdownDLL(void); DLLEXPORT int STDCALL GetGOScriptID(const char *name, uint8_t is_door); DLLEXPORT void STDCALLPTR CreateInstance(int id); DLLEXPORT void STDCALL DestroyInstance(int id, void *ptr); -DLLEXPORT short STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data); +DLLEXPORT int16_t STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data); DLLEXPORT int STDCALL GetTriggerScriptID(int trigger_room, int trigger_face); DLLEXPORT int STDCALL GetCOScriptList(int **list, int **id_list); DLLEXPORT int STDCALL SaveRestoreState(void *file_ptr, uint8_t saving_state); @@ -77,82 +77,82 @@ class BaseScript { public: BaseScript(); ~BaseScript(); - virtual short CallEvent(int event, tOSIRISEventInfo *data); + virtual int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class LevelScript_0000 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_08B3 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_08AE : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_1213 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_117D : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0000 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0001 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0003 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0005 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0002 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0009 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0007 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0006 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0004 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0008 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; // ====================== @@ -880,7 +880,7 @@ void STDCALL DestroyInstance(int id, void *ptr) { // =================== // CallInstanceEvent() // =================== -short STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data) { +int16_t STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data) { switch (id) { case ID_LEVEL_0000: case ID_CUSTOM_OBJECT_08B3: @@ -976,12 +976,12 @@ BaseScript::BaseScript() {} BaseScript::~BaseScript() {} -short BaseScript::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t BaseScript::CallEvent(int event, tOSIRISEventInfo *data) { mprintf(0, "BaseScript::CallEvent()\n"); return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_SAVESTATE: { tOSIRISEVTSAVESTATE *event_data = &data->evt_savestate; @@ -1775,7 +1775,7 @@ short LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_08B3::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_08B3::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -1873,7 +1873,7 @@ short CustomObjectScript_08B3::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_08AE::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_08AE::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_AIN_MOVIE_END: { tOSIRISEVTAINOTIFY *event_data = &data->evt_ain_movie_end; @@ -1891,7 +1891,7 @@ short CustomObjectScript_08AE::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_1213::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_1213::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_DESTROY: { tOSIRISEVTDESTROY *event_data = &data->evt_destroy; @@ -1915,7 +1915,7 @@ short CustomObjectScript_1213::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_117D::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_117D::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_DESTROY: { tOSIRISEVTDESTROY *event_data = &data->evt_destroy; @@ -1939,7 +1939,7 @@ short CustomObjectScript_117D::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -1957,7 +1957,7 @@ short TriggerScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0001::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0001::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -1981,7 +1981,7 @@ short TriggerScript_0001::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0003::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0003::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -1999,7 +1999,7 @@ short TriggerScript_0003::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0005::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0005::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -2017,7 +2017,7 @@ short TriggerScript_0005::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0002::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0002::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -2035,7 +2035,7 @@ short TriggerScript_0002::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0009::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0009::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -2053,7 +2053,7 @@ short TriggerScript_0009::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0007::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0007::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -2071,7 +2071,7 @@ short TriggerScript_0007::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0006::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0006::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -2089,7 +2089,7 @@ short TriggerScript_0006::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0004::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0004::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -2107,7 +2107,7 @@ short TriggerScript_0004::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0008::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0008::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; diff --git a/scripts/level5.cpp b/scripts/level5.cpp index 0c997c11..7058fe1b 100644 --- a/scripts/level5.cpp +++ b/scripts/level5.cpp @@ -40,7 +40,7 @@ DLLEXPORT void STDCALL ShutdownDLL(void); DLLEXPORT int STDCALL GetGOScriptID(const char *name, uint8_t is_door); DLLEXPORT void STDCALLPTR CreateInstance(int id); DLLEXPORT void STDCALL DestroyInstance(int id, void *ptr); -DLLEXPORT short STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data); +DLLEXPORT int16_t STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data); DLLEXPORT int STDCALL GetTriggerScriptID(int trigger_room, int trigger_face); DLLEXPORT int STDCALL GetCOScriptList(int **list, int **id_list); DLLEXPORT int STDCALL SaveRestoreState(void *file_ptr, uint8_t saving_state); @@ -95,172 +95,172 @@ class BaseScript { public: BaseScript(); ~BaseScript(); - virtual short CallEvent(int event, tOSIRISEventInfo *data); + virtual int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class LevelScript_0000 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_200D : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_281B : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_3816 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_1012 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_181C : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0820 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_1044 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0000 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0005 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0006 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0004 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0009 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0002 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0007 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0003 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_000A : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0001 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0008 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0010 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_000E : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_000C : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0014 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0012 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_000F : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_000D : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_000B : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0013 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0011 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0016 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0017 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0015 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0018 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; // ====================== @@ -1305,7 +1305,7 @@ void STDCALL DestroyInstance(int id, void *ptr) { // =================== // CallInstanceEvent() // =================== -short STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data) { +int16_t STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data) { switch (id) { case ID_LEVEL_0000: case ID_CUSTOM_OBJECT_200D: @@ -1468,12 +1468,12 @@ BaseScript::BaseScript() {} BaseScript::~BaseScript() {} -short BaseScript::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t BaseScript::CallEvent(int event, tOSIRISEventInfo *data) { mprintf(0, "BaseScript::CallEvent()\n"); return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_SAVESTATE: { tOSIRISEVTSAVESTATE *event_data = &data->evt_savestate; @@ -1869,7 +1869,7 @@ short LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_200D::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_200D::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -1938,7 +1938,7 @@ short CustomObjectScript_200D::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_281B::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_281B::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -1998,7 +1998,7 @@ short CustomObjectScript_281B::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_3816::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_3816::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -2058,7 +2058,7 @@ short CustomObjectScript_3816::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_1012::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_1012::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -2118,7 +2118,7 @@ short CustomObjectScript_1012::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_181C::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_181C::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -2178,7 +2178,7 @@ short CustomObjectScript_181C::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0820::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0820::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -2199,7 +2199,7 @@ short CustomObjectScript_0820::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_1044::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_1044::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -2220,7 +2220,7 @@ short CustomObjectScript_1044::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -2266,7 +2266,7 @@ short TriggerScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0005::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0005::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -2292,7 +2292,7 @@ short TriggerScript_0005::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0006::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0006::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -2310,7 +2310,7 @@ short TriggerScript_0006::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0004::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0004::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -2328,7 +2328,7 @@ short TriggerScript_0004::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0009::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0009::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -2346,7 +2346,7 @@ short TriggerScript_0009::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0002::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0002::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -2364,7 +2364,7 @@ short TriggerScript_0002::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0007::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0007::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -2382,7 +2382,7 @@ short TriggerScript_0007::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0003::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0003::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -2400,7 +2400,7 @@ short TriggerScript_0003::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_000A::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_000A::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -2418,7 +2418,7 @@ short TriggerScript_000A::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0001::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0001::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -2436,7 +2436,7 @@ short TriggerScript_0001::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0008::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0008::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -2454,7 +2454,7 @@ short TriggerScript_0008::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0010::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0010::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -2472,7 +2472,7 @@ short TriggerScript_0010::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_000E::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_000E::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -2490,7 +2490,7 @@ short TriggerScript_000E::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_000C::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_000C::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -2508,7 +2508,7 @@ short TriggerScript_000C::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0014::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0014::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -2526,7 +2526,7 @@ short TriggerScript_0014::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0012::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0012::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -2544,7 +2544,7 @@ short TriggerScript_0012::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_000F::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_000F::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -2562,7 +2562,7 @@ short TriggerScript_000F::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_000D::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_000D::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -2580,7 +2580,7 @@ short TriggerScript_000D::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_000B::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_000B::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -2598,7 +2598,7 @@ short TriggerScript_000B::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0013::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0013::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -2616,7 +2616,7 @@ short TriggerScript_0013::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0011::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0011::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -2634,7 +2634,7 @@ short TriggerScript_0011::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0016::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0016::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -2652,7 +2652,7 @@ short TriggerScript_0016::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0017::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0017::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -2670,7 +2670,7 @@ short TriggerScript_0017::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0015::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0015::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -2688,7 +2688,7 @@ short TriggerScript_0015::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0018::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0018::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; diff --git a/scripts/level7.cpp b/scripts/level7.cpp index 02d8dbe5..4c0c849d 100644 --- a/scripts/level7.cpp +++ b/scripts/level7.cpp @@ -40,7 +40,7 @@ DLLEXPORT void STDCALL ShutdownDLL(void); DLLEXPORT int STDCALL GetGOScriptID(const char *name, uint8_t is_door); DLLEXPORT void STDCALLPTR CreateInstance(int id); DLLEXPORT void STDCALL DestroyInstance(int id, void *ptr); -DLLEXPORT short STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data); +DLLEXPORT int16_t STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data); DLLEXPORT int STDCALL GetTriggerScriptID(int trigger_room, int trigger_face); DLLEXPORT int STDCALL GetCOScriptList(int **list, int **id_list); DLLEXPORT int STDCALL SaveRestoreState(void *file_ptr, uint8_t saving_state); @@ -128,337 +128,337 @@ class BaseScript { public: BaseScript(); ~BaseScript(); - virtual short CallEvent(int event, tOSIRISEventInfo *data); + virtual int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class LevelScript_0000 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_1097 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_08B5 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0895 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_08A1 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_08A2 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_08AF : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_1901 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_090A : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_1109 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0908 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0907 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_090C : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_110D : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_090B : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_30A8 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0940 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0941 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0944 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_08B4 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_08B3 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0943 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0942 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_18B8 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_20B1 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_089A : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0945 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_192A : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_092B : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_1021 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_092C : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_112D : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0861 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0862 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_186B : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_2071 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_2148 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_2059 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_205B : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_1947 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_2146 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_205A : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0923 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0003 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0005 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0007 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0006 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_001E : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0019 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0016 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_000E : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_000B : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_001C : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_001A : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_000C : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0009 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_001B : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0015 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_001D : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_001F : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_000F : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_000D : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0010 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_000A : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0000 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0020 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; // ====================== @@ -1653,7 +1653,7 @@ void STDCALL DestroyInstance(int id, void *ptr) { // =================== // CallInstanceEvent() // =================== -short STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data) { +int16_t STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data) { switch (id) { case ID_LEVEL_0000: case ID_CUSTOM_OBJECT_1097: @@ -1885,12 +1885,12 @@ BaseScript::BaseScript() {} BaseScript::~BaseScript() {} -short BaseScript::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t BaseScript::CallEvent(int event, tOSIRISEventInfo *data) { mprintf(0, "BaseScript::CallEvent()\n"); return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_SAVESTATE: { tOSIRISEVTSAVESTATE *event_data = &data->evt_savestate; @@ -1989,7 +1989,7 @@ short LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_1097::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_1097::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_DESTROY: { tOSIRISEVTDESTROY *event_data = &data->evt_destroy; @@ -2048,7 +2048,7 @@ short CustomObjectScript_1097::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_08B5::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_08B5::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { tOSIRISEVTCREATED *event_data = &data->evt_created; @@ -2067,7 +2067,7 @@ short CustomObjectScript_08B5::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0895::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0895::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { tOSIRISEVTCREATED *event_data = &data->evt_created; @@ -2086,7 +2086,7 @@ short CustomObjectScript_0895::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_08A1::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_08A1::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { tOSIRISEVTCREATED *event_data = &data->evt_created; @@ -2105,7 +2105,7 @@ short CustomObjectScript_08A1::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_08A2::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_08A2::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { tOSIRISEVTCREATED *event_data = &data->evt_created; @@ -2124,7 +2124,7 @@ short CustomObjectScript_08A2::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_08AF::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_08AF::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { tOSIRISEVTCREATED *event_data = &data->evt_created; @@ -2143,7 +2143,7 @@ short CustomObjectScript_08AF::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_1901::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_1901::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -2195,7 +2195,7 @@ short CustomObjectScript_1901::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_090A::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_090A::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_DESTROY: { tOSIRISEVTDESTROY *event_data = &data->evt_destroy; @@ -2218,7 +2218,7 @@ short CustomObjectScript_090A::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_1109::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_1109::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_DESTROY: { tOSIRISEVTDESTROY *event_data = &data->evt_destroy; @@ -2241,7 +2241,7 @@ short CustomObjectScript_1109::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0908::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0908::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_DESTROY: { tOSIRISEVTDESTROY *event_data = &data->evt_destroy; @@ -2264,7 +2264,7 @@ short CustomObjectScript_0908::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0907::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0907::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_DESTROY: { tOSIRISEVTDESTROY *event_data = &data->evt_destroy; @@ -2287,7 +2287,7 @@ short CustomObjectScript_0907::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_090C::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_090C::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -2310,7 +2310,7 @@ short CustomObjectScript_090C::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_110D::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_110D::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -2333,7 +2333,7 @@ short CustomObjectScript_110D::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_090B::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_090B::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -2371,7 +2371,7 @@ short CustomObjectScript_090B::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_30A8::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_30A8::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -2391,7 +2391,7 @@ short CustomObjectScript_30A8::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0940::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0940::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -2428,7 +2428,7 @@ short CustomObjectScript_0940::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0941::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0941::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -2465,7 +2465,7 @@ short CustomObjectScript_0941::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0944::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0944::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -2490,7 +2490,7 @@ short CustomObjectScript_0944::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_08B4::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_08B4::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { tOSIRISEVTCREATED *event_data = &data->evt_created; @@ -2510,7 +2510,7 @@ short CustomObjectScript_08B4::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_08B3::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_08B3::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { tOSIRISEVTCREATED *event_data = &data->evt_created; @@ -2530,7 +2530,7 @@ short CustomObjectScript_08B3::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0943::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0943::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -2555,7 +2555,7 @@ short CustomObjectScript_0943::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0942::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0942::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -2580,7 +2580,7 @@ short CustomObjectScript_0942::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_18B8::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_18B8::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -2611,7 +2611,7 @@ short CustomObjectScript_18B8::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_20B1::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_20B1::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -2642,7 +2642,7 @@ short CustomObjectScript_20B1::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_089A::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_089A::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { tOSIRISEVTCREATED *event_data = &data->evt_created; @@ -2667,7 +2667,7 @@ short CustomObjectScript_089A::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0945::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0945::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -2693,7 +2693,7 @@ short CustomObjectScript_0945::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_192A::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_192A::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -2744,7 +2744,7 @@ short CustomObjectScript_192A::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_092B::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_092B::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -2795,7 +2795,7 @@ short CustomObjectScript_092B::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_1021::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_1021::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -2815,7 +2815,7 @@ short CustomObjectScript_1021::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_092C::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_092C::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -2835,7 +2835,7 @@ short CustomObjectScript_092C::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_112D::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_112D::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -2855,7 +2855,7 @@ short CustomObjectScript_112D::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0861::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0861::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -2879,7 +2879,7 @@ short CustomObjectScript_0861::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0862::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0862::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -2903,7 +2903,7 @@ short CustomObjectScript_0862::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_186B::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_186B::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -2927,7 +2927,7 @@ short CustomObjectScript_186B::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_2071::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_2071::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -2951,7 +2951,7 @@ short CustomObjectScript_2071::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_2148::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_2148::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -2982,7 +2982,7 @@ short CustomObjectScript_2148::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_2059::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_2059::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3001,7 +3001,7 @@ short CustomObjectScript_2059::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_205B::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_205B::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3020,7 +3020,7 @@ short CustomObjectScript_205B::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_1947::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_1947::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3039,7 +3039,7 @@ short CustomObjectScript_1947::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_2146::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_2146::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3058,7 +3058,7 @@ short CustomObjectScript_2146::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_205A::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_205A::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3077,7 +3077,7 @@ short CustomObjectScript_205A::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0923::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0923::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_DESTROY: { tOSIRISEVTDESTROY *event_data = &data->evt_destroy; @@ -3099,7 +3099,7 @@ short CustomObjectScript_0923::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0003::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0003::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3118,7 +3118,7 @@ short TriggerScript_0003::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0005::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0005::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3136,7 +3136,7 @@ short TriggerScript_0005::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0007::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0007::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3164,7 +3164,7 @@ short TriggerScript_0007::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0006::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0006::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3192,7 +3192,7 @@ short TriggerScript_0006::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_001E::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_001E::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3210,7 +3210,7 @@ short TriggerScript_001E::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0019::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0019::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3228,7 +3228,7 @@ short TriggerScript_0019::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0016::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0016::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3246,7 +3246,7 @@ short TriggerScript_0016::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_000E::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_000E::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3264,7 +3264,7 @@ short TriggerScript_000E::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_000B::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_000B::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3282,7 +3282,7 @@ short TriggerScript_000B::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_001C::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_001C::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3300,7 +3300,7 @@ short TriggerScript_001C::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_001A::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_001A::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3318,7 +3318,7 @@ short TriggerScript_001A::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_000C::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_000C::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3336,7 +3336,7 @@ short TriggerScript_000C::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0009::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0009::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3354,7 +3354,7 @@ short TriggerScript_0009::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_001B::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_001B::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3372,7 +3372,7 @@ short TriggerScript_001B::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0015::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0015::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3390,7 +3390,7 @@ short TriggerScript_0015::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_001D::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_001D::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3408,7 +3408,7 @@ short TriggerScript_001D::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_001F::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_001F::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3426,7 +3426,7 @@ short TriggerScript_001F::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_000F::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_000F::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3444,7 +3444,7 @@ short TriggerScript_000F::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_000D::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_000D::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3462,7 +3462,7 @@ short TriggerScript_000D::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0010::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0010::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3480,7 +3480,7 @@ short TriggerScript_0010::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_000A::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_000A::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3498,7 +3498,7 @@ short TriggerScript_000A::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3517,7 +3517,7 @@ short TriggerScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0020::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0020::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; diff --git a/scripts/level8.cpp b/scripts/level8.cpp index df1ebb78..52ae4817 100644 --- a/scripts/level8.cpp +++ b/scripts/level8.cpp @@ -40,7 +40,7 @@ DLLEXPORT void STDCALL ShutdownDLL(void); DLLEXPORT int STDCALL GetGOScriptID(const char *name, uint8_t is_door); DLLEXPORT void STDCALLPTR CreateInstance(int id); DLLEXPORT void STDCALL DestroyInstance(int id, void *ptr); -DLLEXPORT short STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data); +DLLEXPORT int16_t STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data); DLLEXPORT int STDCALL GetTriggerScriptID(int trigger_room, int trigger_face); DLLEXPORT int STDCALL GetCOScriptList(int **list, int **id_list); DLLEXPORT int STDCALL SaveRestoreState(void *file_ptr, uint8_t saving_state); @@ -124,317 +124,317 @@ class BaseScript { public: BaseScript(); ~BaseScript(); - virtual short CallEvent(int event, tOSIRISEventInfo *data); + virtual int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class LevelScript_0000 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_10FD : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0839 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0838 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_3026 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0901 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0900 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_08FF : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_20FE : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_083D : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_09E3 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_09FF : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_1904 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_08C1 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_090F : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_090E : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0910 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_090C : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_090B : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_090A : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_2853 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_090D : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_19E2 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_09FB : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_09FC : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_09FD : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0845 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0846 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0844 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0849 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0848 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0847 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_084A : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_084D : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_084C : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_084B : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_1088 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0000 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0018 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0016 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0007 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0005 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0004 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0002 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0015 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0013 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0011 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_000F : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0001 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0014 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0012 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0010 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_000B : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_000A : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0009 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_000E : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_000D : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_000C : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0008 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0006 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0003 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0017 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; // ====================== @@ -1703,7 +1703,7 @@ void STDCALL DestroyInstance(int id, void *ptr) { // =================== // CallInstanceEvent() // =================== -short STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data) { +int16_t STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data) { switch (id) { case ID_LEVEL_0000: case ID_CUSTOM_OBJECT_10FD: @@ -1930,12 +1930,12 @@ BaseScript::BaseScript() {} BaseScript::~BaseScript() {} -short BaseScript::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t BaseScript::CallEvent(int event, tOSIRISEventInfo *data) { mprintf(0, "BaseScript::CallEvent()\n"); return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_SAVESTATE: { tOSIRISEVTSAVESTATE *event_data = &data->evt_savestate; @@ -2535,7 +2535,7 @@ short LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_10FD::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_10FD::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -2590,7 +2590,7 @@ short CustomObjectScript_10FD::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0839::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0839::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_DESTROY: { tOSIRISEVTDESTROY *event_data = &data->evt_destroy; @@ -2620,7 +2620,7 @@ short CustomObjectScript_0839::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0838::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0838::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_DESTROY: { tOSIRISEVTDESTROY *event_data = &data->evt_destroy; @@ -2643,7 +2643,7 @@ short CustomObjectScript_0838::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_3026::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_3026::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_DESTROY: { tOSIRISEVTDESTROY *event_data = &data->evt_destroy; @@ -2666,7 +2666,7 @@ short CustomObjectScript_3026::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0901::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0901::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -2687,7 +2687,7 @@ short CustomObjectScript_0901::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0900::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0900::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -2708,7 +2708,7 @@ short CustomObjectScript_0900::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_08FF::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_08FF::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -2731,7 +2731,7 @@ short CustomObjectScript_08FF::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_20FE::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_20FE::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -2754,7 +2754,7 @@ short CustomObjectScript_20FE::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_083D::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_083D::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -2802,7 +2802,7 @@ short CustomObjectScript_083D::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_09E3::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_09E3::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -2829,7 +2829,7 @@ short CustomObjectScript_09E3::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_09FF::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_09FF::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -2847,7 +2847,7 @@ short CustomObjectScript_09FF::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_1904::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_1904::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -2868,7 +2868,7 @@ short CustomObjectScript_1904::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_08C1::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_08C1::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_DESTROY: { tOSIRISEVTDESTROY *event_data = &data->evt_destroy; @@ -2892,7 +2892,7 @@ short CustomObjectScript_08C1::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_090F::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_090F::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -2918,7 +2918,7 @@ short CustomObjectScript_090F::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_090E::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_090E::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -2936,7 +2936,7 @@ short CustomObjectScript_090E::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0910::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0910::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -2954,7 +2954,7 @@ short CustomObjectScript_0910::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_090C::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_090C::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -2972,7 +2972,7 @@ short CustomObjectScript_090C::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_090B::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_090B::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -2999,7 +2999,7 @@ short CustomObjectScript_090B::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_090A::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_090A::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3017,7 +3017,7 @@ short CustomObjectScript_090A::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_2853::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_2853::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_AIN_GOALCOMPLETE: { tOSIRISEVTAINOTIFY *event_data = &data->evt_ain_goalcomplete; @@ -3035,7 +3035,7 @@ short CustomObjectScript_2853::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_090D::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_090D::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3065,7 +3065,7 @@ short CustomObjectScript_090D::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_19E2::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_19E2::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3087,7 +3087,7 @@ short CustomObjectScript_19E2::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_09FB::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_09FB::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_DESTROY: { tOSIRISEVTDESTROY *event_data = &data->evt_destroy; @@ -3114,7 +3114,7 @@ short CustomObjectScript_09FB::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_09FC::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_09FC::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_DESTROY: { tOSIRISEVTDESTROY *event_data = &data->evt_destroy; @@ -3141,7 +3141,7 @@ short CustomObjectScript_09FC::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_09FD::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_09FD::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_DESTROY: { tOSIRISEVTDESTROY *event_data = &data->evt_destroy; @@ -3168,7 +3168,7 @@ short CustomObjectScript_09FD::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0845::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0845::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3186,7 +3186,7 @@ short CustomObjectScript_0845::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0846::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0846::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3204,7 +3204,7 @@ short CustomObjectScript_0846::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0844::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0844::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3231,7 +3231,7 @@ short CustomObjectScript_0844::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0849::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0849::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3249,7 +3249,7 @@ short CustomObjectScript_0849::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0848::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0848::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3267,7 +3267,7 @@ short CustomObjectScript_0848::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0847::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0847::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3285,7 +3285,7 @@ short CustomObjectScript_0847::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_084A::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_084A::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3303,7 +3303,7 @@ short CustomObjectScript_084A::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_084D::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_084D::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3321,7 +3321,7 @@ short CustomObjectScript_084D::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_084C::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_084C::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3339,7 +3339,7 @@ short CustomObjectScript_084C::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_084B::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_084B::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3357,7 +3357,7 @@ short CustomObjectScript_084B::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_1088::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_1088::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3375,7 +3375,7 @@ short CustomObjectScript_1088::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3404,7 +3404,7 @@ short TriggerScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0018::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0018::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3423,7 +3423,7 @@ short TriggerScript_0018::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0016::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0016::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3441,7 +3441,7 @@ short TriggerScript_0016::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0007::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0007::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3459,7 +3459,7 @@ short TriggerScript_0007::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0005::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0005::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3477,7 +3477,7 @@ short TriggerScript_0005::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0004::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0004::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3495,7 +3495,7 @@ short TriggerScript_0004::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0002::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0002::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3513,7 +3513,7 @@ short TriggerScript_0002::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0015::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0015::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3531,7 +3531,7 @@ short TriggerScript_0015::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0013::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0013::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3549,7 +3549,7 @@ short TriggerScript_0013::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0011::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0011::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3567,7 +3567,7 @@ short TriggerScript_0011::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_000F::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_000F::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3585,7 +3585,7 @@ short TriggerScript_000F::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0001::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0001::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3603,7 +3603,7 @@ short TriggerScript_0001::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0014::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0014::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3621,7 +3621,7 @@ short TriggerScript_0014::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0012::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0012::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3639,7 +3639,7 @@ short TriggerScript_0012::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0010::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0010::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3657,7 +3657,7 @@ short TriggerScript_0010::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_000B::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_000B::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3675,7 +3675,7 @@ short TriggerScript_000B::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_000A::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_000A::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3693,7 +3693,7 @@ short TriggerScript_000A::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0009::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0009::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3711,7 +3711,7 @@ short TriggerScript_0009::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_000E::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_000E::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3729,7 +3729,7 @@ short TriggerScript_000E::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_000D::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_000D::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3747,7 +3747,7 @@ short TriggerScript_000D::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_000C::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_000C::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3765,7 +3765,7 @@ short TriggerScript_000C::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0008::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0008::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3783,7 +3783,7 @@ short TriggerScript_0008::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0006::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0006::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3801,7 +3801,7 @@ short TriggerScript_0006::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0003::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0003::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3819,7 +3819,7 @@ short TriggerScript_0003::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0017::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0017::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; diff --git a/scripts/levelS2.cpp b/scripts/levelS2.cpp index 7929bef2..b4ac61ff 100644 --- a/scripts/levelS2.cpp +++ b/scripts/levelS2.cpp @@ -40,7 +40,7 @@ DLLEXPORT void STDCALL ShutdownDLL(void); DLLEXPORT int STDCALL GetGOScriptID(const char *name, uint8_t is_door); DLLEXPORT void STDCALLPTR CreateInstance(int id); DLLEXPORT void STDCALL DestroyInstance(int id, void *ptr); -DLLEXPORT short STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data); +DLLEXPORT int16_t STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data); DLLEXPORT int STDCALL GetTriggerScriptID(int trigger_room, int trigger_face); DLLEXPORT int STDCALL GetCOScriptList(int **list, int **id_list); DLLEXPORT int STDCALL SaveRestoreState(void *file_ptr, uint8_t saving_state); @@ -196,677 +196,677 @@ class BaseScript { public: BaseScript(); ~BaseScript(); - virtual short CallEvent(int event, tOSIRISEventInfo *data); + virtual int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class LevelScript_0000 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0821 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0820 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_181E : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_081F : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0814 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0815 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0816 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0818 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0819 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0817 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_1024 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0826 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0828 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0827 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_086A : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_086B : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0829 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_08C4 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_10CE : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0809 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0808 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_1007 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_1006 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0805 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_1004 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_1003 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_100E : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0845 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0844 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0843 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0842 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0841 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0840 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_083F : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_083E : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_083D : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_083C : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_083B : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_083A : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0851 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0850 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_084F : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_084E : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_084D : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_084C : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_084B : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_084A : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0849 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0848 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0847 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0846 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_085D : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_085C : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_085B : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_085A : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0859 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0858 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0857 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0856 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0855 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0854 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0853 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0852 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0869 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0868 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0867 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0866 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0865 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0864 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0863 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0862 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0861 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0860 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_085F : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_085E : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_003B : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_003A : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0035 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0034 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0031 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_002F : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_002E : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0023 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0022 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0021 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0020 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_001B : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_001A : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0017 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0016 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0015 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0014 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0013 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0012 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0011 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0010 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_000B : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_000A : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0009 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0008 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0005 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0004 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0001 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0000 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_003D : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_003C : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0039 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0038 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0037 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0036 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0033 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0032 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0030 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_002C : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0027 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0026 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0025 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0024 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_001F : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_001E : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_001D : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_001C : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0019 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0018 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_000F : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_000E : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_000D : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_000C : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0007 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0006 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0003 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0002 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0040 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; // ====================== @@ -2787,7 +2787,7 @@ void STDCALL DestroyInstance(int id, void *ptr) { // =================== // CallInstanceEvent() // =================== -short STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data) { +int16_t STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data) { switch (id) { case ID_LEVEL_0000: case ID_CUSTOM_OBJECT_0821: @@ -3235,12 +3235,12 @@ BaseScript::BaseScript() {} BaseScript::~BaseScript() {} -short BaseScript::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t BaseScript::CallEvent(int event, tOSIRISEventInfo *data) { mprintf(0, "BaseScript::CallEvent()\n"); return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_SAVESTATE: { tOSIRISEVTSAVESTATE *event_data = &data->evt_savestate; @@ -3417,7 +3417,7 @@ short LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0821::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0821::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3439,7 +3439,7 @@ short CustomObjectScript_0821::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0820::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0820::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3461,7 +3461,7 @@ short CustomObjectScript_0820::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_181E::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_181E::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3483,7 +3483,7 @@ short CustomObjectScript_181E::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_081F::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_081F::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3505,7 +3505,7 @@ short CustomObjectScript_081F::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0814::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0814::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_DESTROY: { tOSIRISEVTDESTROY *event_data = &data->evt_destroy; @@ -3527,7 +3527,7 @@ short CustomObjectScript_0814::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0815::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0815::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_DESTROY: { tOSIRISEVTDESTROY *event_data = &data->evt_destroy; @@ -3549,7 +3549,7 @@ short CustomObjectScript_0815::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0816::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0816::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -3589,7 +3589,7 @@ short CustomObjectScript_0816::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0818::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0818::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_DESTROY: { tOSIRISEVTDESTROY *event_data = &data->evt_destroy; @@ -3611,7 +3611,7 @@ short CustomObjectScript_0818::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0819::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0819::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_DESTROY: { tOSIRISEVTDESTROY *event_data = &data->evt_destroy; @@ -3633,7 +3633,7 @@ short CustomObjectScript_0819::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0817::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0817::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -3673,7 +3673,7 @@ short CustomObjectScript_0817::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_1024::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_1024::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3694,7 +3694,7 @@ short CustomObjectScript_1024::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0826::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0826::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3715,7 +3715,7 @@ short CustomObjectScript_0826::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0828::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0828::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_DESTROY: { tOSIRISEVTDESTROY *event_data = &data->evt_destroy; @@ -3740,7 +3740,7 @@ short CustomObjectScript_0828::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0827::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0827::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_DESTROY: { tOSIRISEVTDESTROY *event_data = &data->evt_destroy; @@ -3765,7 +3765,7 @@ short CustomObjectScript_0827::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_086A::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_086A::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -3794,7 +3794,7 @@ short CustomObjectScript_086A::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_086B::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_086B::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -3823,7 +3823,7 @@ short CustomObjectScript_086B::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0829::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0829::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -3851,7 +3851,7 @@ short CustomObjectScript_0829::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_08C4::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_08C4::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3962,7 +3962,7 @@ short CustomObjectScript_08C4::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_10CE::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_10CE::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -3981,7 +3981,7 @@ short CustomObjectScript_10CE::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0809::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0809::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -4019,7 +4019,7 @@ short CustomObjectScript_0809::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0808::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0808::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -4057,7 +4057,7 @@ short CustomObjectScript_0808::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_1007::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_1007::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -4095,7 +4095,7 @@ short CustomObjectScript_1007::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_1006::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_1006::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -4133,7 +4133,7 @@ short CustomObjectScript_1006::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0805::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0805::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -4171,7 +4171,7 @@ short CustomObjectScript_0805::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_1004::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_1004::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -4195,7 +4195,7 @@ short CustomObjectScript_1004::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_1003::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_1003::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -4219,7 +4219,7 @@ short CustomObjectScript_1003::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_100E::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_100E::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -4243,7 +4243,7 @@ short CustomObjectScript_100E::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0845::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0845::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -4261,7 +4261,7 @@ short CustomObjectScript_0845::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0844::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0844::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -4279,7 +4279,7 @@ short CustomObjectScript_0844::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0843::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0843::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -4297,7 +4297,7 @@ short CustomObjectScript_0843::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0842::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0842::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -4315,7 +4315,7 @@ short CustomObjectScript_0842::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0841::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0841::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -4333,7 +4333,7 @@ short CustomObjectScript_0841::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0840::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0840::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -4351,7 +4351,7 @@ short CustomObjectScript_0840::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_083F::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_083F::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -4369,7 +4369,7 @@ short CustomObjectScript_083F::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_083E::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_083E::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -4387,7 +4387,7 @@ short CustomObjectScript_083E::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_083D::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_083D::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -4405,7 +4405,7 @@ short CustomObjectScript_083D::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_083C::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_083C::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -4423,7 +4423,7 @@ short CustomObjectScript_083C::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_083B::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_083B::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -4441,7 +4441,7 @@ short CustomObjectScript_083B::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_083A::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_083A::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -4459,7 +4459,7 @@ short CustomObjectScript_083A::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0851::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0851::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -4477,7 +4477,7 @@ short CustomObjectScript_0851::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0850::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0850::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -4495,7 +4495,7 @@ short CustomObjectScript_0850::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_084F::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_084F::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -4513,7 +4513,7 @@ short CustomObjectScript_084F::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_084E::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_084E::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -4531,7 +4531,7 @@ short CustomObjectScript_084E::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_084D::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_084D::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -4549,7 +4549,7 @@ short CustomObjectScript_084D::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_084C::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_084C::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -4567,7 +4567,7 @@ short CustomObjectScript_084C::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_084B::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_084B::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -4585,7 +4585,7 @@ short CustomObjectScript_084B::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_084A::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_084A::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -4603,7 +4603,7 @@ short CustomObjectScript_084A::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0849::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0849::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -4621,7 +4621,7 @@ short CustomObjectScript_0849::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0848::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0848::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -4639,7 +4639,7 @@ short CustomObjectScript_0848::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0847::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0847::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -4657,7 +4657,7 @@ short CustomObjectScript_0847::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0846::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0846::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -4675,7 +4675,7 @@ short CustomObjectScript_0846::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_085D::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_085D::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -4693,7 +4693,7 @@ short CustomObjectScript_085D::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_085C::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_085C::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -4711,7 +4711,7 @@ short CustomObjectScript_085C::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_085B::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_085B::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -4729,7 +4729,7 @@ short CustomObjectScript_085B::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_085A::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_085A::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -4747,7 +4747,7 @@ short CustomObjectScript_085A::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0859::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0859::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -4765,7 +4765,7 @@ short CustomObjectScript_0859::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0858::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0858::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -4783,7 +4783,7 @@ short CustomObjectScript_0858::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0857::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0857::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -4801,7 +4801,7 @@ short CustomObjectScript_0857::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0856::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0856::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -4819,7 +4819,7 @@ short CustomObjectScript_0856::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0855::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0855::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -4837,7 +4837,7 @@ short CustomObjectScript_0855::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0854::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0854::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -4855,7 +4855,7 @@ short CustomObjectScript_0854::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0853::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0853::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -4873,7 +4873,7 @@ short CustomObjectScript_0853::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0852::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0852::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -4891,7 +4891,7 @@ short CustomObjectScript_0852::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0869::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0869::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -4909,7 +4909,7 @@ short CustomObjectScript_0869::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0868::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0868::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -4927,7 +4927,7 @@ short CustomObjectScript_0868::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0867::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0867::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -4945,7 +4945,7 @@ short CustomObjectScript_0867::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0866::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0866::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -4963,7 +4963,7 @@ short CustomObjectScript_0866::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0865::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0865::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -4981,7 +4981,7 @@ short CustomObjectScript_0865::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0864::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0864::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -4999,7 +4999,7 @@ short CustomObjectScript_0864::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0863::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0863::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -5017,7 +5017,7 @@ short CustomObjectScript_0863::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0862::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0862::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -5035,7 +5035,7 @@ short CustomObjectScript_0862::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0861::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0861::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -5053,7 +5053,7 @@ short CustomObjectScript_0861::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0860::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0860::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -5071,7 +5071,7 @@ short CustomObjectScript_0860::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_085F::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_085F::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -5089,7 +5089,7 @@ short CustomObjectScript_085F::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_085E::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_085E::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -5107,7 +5107,7 @@ short CustomObjectScript_085E::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_003B::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_003B::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5126,7 +5126,7 @@ short TriggerScript_003B::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_003A::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_003A::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5145,7 +5145,7 @@ short TriggerScript_003A::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0035::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0035::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5164,7 +5164,7 @@ short TriggerScript_0035::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0034::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0034::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5183,7 +5183,7 @@ short TriggerScript_0034::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0031::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0031::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5202,7 +5202,7 @@ short TriggerScript_0031::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_002F::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_002F::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5221,7 +5221,7 @@ short TriggerScript_002F::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_002E::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_002E::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5240,7 +5240,7 @@ short TriggerScript_002E::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0023::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0023::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5259,7 +5259,7 @@ short TriggerScript_0023::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0022::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0022::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5278,7 +5278,7 @@ short TriggerScript_0022::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0021::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0021::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5297,7 +5297,7 @@ short TriggerScript_0021::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0020::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0020::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5316,7 +5316,7 @@ short TriggerScript_0020::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_001B::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_001B::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5335,7 +5335,7 @@ short TriggerScript_001B::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_001A::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_001A::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5354,7 +5354,7 @@ short TriggerScript_001A::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0017::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0017::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5373,7 +5373,7 @@ short TriggerScript_0017::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0016::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0016::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5392,7 +5392,7 @@ short TriggerScript_0016::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0015::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0015::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5411,7 +5411,7 @@ short TriggerScript_0015::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0014::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0014::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5430,7 +5430,7 @@ short TriggerScript_0014::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0013::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0013::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5449,7 +5449,7 @@ short TriggerScript_0013::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0012::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0012::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5468,7 +5468,7 @@ short TriggerScript_0012::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0011::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0011::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5487,7 +5487,7 @@ short TriggerScript_0011::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0010::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0010::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5506,7 +5506,7 @@ short TriggerScript_0010::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_000B::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_000B::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5525,7 +5525,7 @@ short TriggerScript_000B::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_000A::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_000A::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5544,7 +5544,7 @@ short TriggerScript_000A::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0009::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0009::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5563,7 +5563,7 @@ short TriggerScript_0009::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0008::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0008::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5582,7 +5582,7 @@ short TriggerScript_0008::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0005::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0005::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5601,7 +5601,7 @@ short TriggerScript_0005::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0004::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0004::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5620,7 +5620,7 @@ short TriggerScript_0004::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0001::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0001::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5639,7 +5639,7 @@ short TriggerScript_0001::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5658,7 +5658,7 @@ short TriggerScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_003D::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_003D::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5677,7 +5677,7 @@ short TriggerScript_003D::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_003C::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_003C::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5696,7 +5696,7 @@ short TriggerScript_003C::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0039::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0039::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5715,7 +5715,7 @@ short TriggerScript_0039::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0038::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0038::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5734,7 +5734,7 @@ short TriggerScript_0038::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0037::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0037::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5753,7 +5753,7 @@ short TriggerScript_0037::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0036::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0036::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5772,7 +5772,7 @@ short TriggerScript_0036::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0033::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0033::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5791,7 +5791,7 @@ short TriggerScript_0033::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0032::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0032::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5810,7 +5810,7 @@ short TriggerScript_0032::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0030::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0030::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5829,7 +5829,7 @@ short TriggerScript_0030::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_002C::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_002C::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5849,7 +5849,7 @@ short TriggerScript_002C::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0027::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0027::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5868,7 +5868,7 @@ short TriggerScript_0027::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0026::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0026::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5887,7 +5887,7 @@ short TriggerScript_0026::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0025::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0025::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5906,7 +5906,7 @@ short TriggerScript_0025::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0024::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0024::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5925,7 +5925,7 @@ short TriggerScript_0024::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_001F::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_001F::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5944,7 +5944,7 @@ short TriggerScript_001F::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_001E::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_001E::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5963,7 +5963,7 @@ short TriggerScript_001E::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_001D::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_001D::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -5982,7 +5982,7 @@ short TriggerScript_001D::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_001C::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_001C::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -6001,7 +6001,7 @@ short TriggerScript_001C::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0019::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0019::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -6020,7 +6020,7 @@ short TriggerScript_0019::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0018::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0018::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -6039,7 +6039,7 @@ short TriggerScript_0018::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_000F::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_000F::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -6058,7 +6058,7 @@ short TriggerScript_000F::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_000E::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_000E::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -6077,7 +6077,7 @@ short TriggerScript_000E::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_000D::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_000D::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -6096,7 +6096,7 @@ short TriggerScript_000D::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_000C::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_000C::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -6115,7 +6115,7 @@ short TriggerScript_000C::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0007::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0007::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -6134,7 +6134,7 @@ short TriggerScript_0007::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0006::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0006::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -6153,7 +6153,7 @@ short TriggerScript_0006::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0003::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0003::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -6172,7 +6172,7 @@ short TriggerScript_0003::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0002::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0002::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -6191,7 +6191,7 @@ short TriggerScript_0002::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0040::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0040::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; diff --git a/scripts/lnx/osiris_common.h b/scripts/lnx/osiris_common.h index 82faa6bd..9dfad076 100644 --- a/scripts/lnx/osiris_common.h +++ b/scripts/lnx/osiris_common.h @@ -1220,9 +1220,9 @@ typedef struct { typedef struct { // Rooms int roomnum; - short facenum; - short texnum; - short portalnum; + int16_t facenum; + int16_t texnum; + int16_t portalnum; float fog_r, fog_g, fog_b, fog_depth; vector wind; uint8_t pulse_time; @@ -1232,8 +1232,8 @@ typedef struct { uint32_t objhandle; uint32_t ithandle; float shields, energy; - short start_tick; - short end_tick; + int16_t start_tick; + int16_t end_tick; float cycle_time; int type, id, aux_type, aux_id; uint32_t checksum; diff --git a/scripts/lnx/osiris_import.h b/scripts/lnx/osiris_import.h index 159e6b9c..e6e01b0d 100644 --- a/scripts/lnx/osiris_import.h +++ b/scripts/lnx/osiris_import.h @@ -238,10 +238,10 @@ OSIRISEXTERN File_ReadBytes_fp File_ReadBytes; typedef int (*File_ReadInt_fp)(void *fileptr); OSIRISEXTERN File_ReadInt_fp File_ReadInt; -// short File_ReadShort(void *fileptr); -// Read and return a short (16 bits) +// int16_t File_ReadShort(void *fileptr); +// Read and return a int16_t (16 bits) // Throws an exception of type (cfile_error *) if the OS returns an error on read -typedef short (*File_ReadShort_fp)(void *fileptr); +typedef int16_t (*File_ReadShort_fp)(void *fileptr); OSIRISEXTERN File_ReadShort_fp File_ReadShort; // int8_t File_ReadByte(void *fileptr); @@ -305,10 +305,10 @@ OSIRISEXTERN File_WriteString_fp File_WriteString; typedef void (*File_WriteInt_fp)(int i, void *fileptr); OSIRISEXTERN File_WriteInt_fp File_WriteInt; -// void File_WriteShort(short s,void *fileptr); -// Write a short (16 bits) +// void File_WriteShort(int16_t s,void *fileptr); +// Write a int16_t (16 bits) // Throws an exception of type (cfile_error *) if the OS returns an error on write -typedef void (*File_WriteShort_fp)(short s, void *fileptr); +typedef void (*File_WriteShort_fp)(int16_t s, void *fileptr); OSIRISEXTERN File_WriteShort_fp File_WriteShort; // void File_WriteByte(int8_t b,void *fileptr); diff --git a/scripts/lnx/osiris_vector.h b/scripts/lnx/osiris_vector.h index a39687c9..992f5351 100644 --- a/scripts/lnx/osiris_vector.h +++ b/scripts/lnx/osiris_vector.h @@ -70,7 +70,7 @@ fix FloatToFixFast(float num); #define ShortToFix(num) (((int32_t)(num)) << FIX_SHIFT) #define FixToFloat(num) (((float)(num)) / FLOAT_SCALER) #define FixToInt(num) ((num) >> FIX_SHIFT) -#define FixToShort(num) ((short)((num) >> FIX_SHIFT)) +#define FixToShort(num) ((int16_t)((num) >> FIX_SHIFT)) // Tables for trig functions float sincos_table[321]; // 256 entries + 64 sin-only + 1 for interpolation diff --git a/scripts/merc5.cpp b/scripts/merc5.cpp index 6dbe6854..1738afee 100644 --- a/scripts/merc5.cpp +++ b/scripts/merc5.cpp @@ -40,7 +40,7 @@ DLLEXPORT void STDCALL ShutdownDLL(void); DLLEXPORT int STDCALL GetGOScriptID(const char *name, uint8_t is_door); DLLEXPORT void STDCALLPTR CreateInstance(int id); DLLEXPORT void STDCALL DestroyInstance(int id, void *ptr); -DLLEXPORT short STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data); +DLLEXPORT int16_t STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data); DLLEXPORT int STDCALL GetTriggerScriptID(int trigger_room, int trigger_face); DLLEXPORT int STDCALL GetCOScriptList(int **list, int **id_list); DLLEXPORT int STDCALL SaveRestoreState(void *file_ptr, uint8_t saving_state); @@ -109,242 +109,242 @@ class BaseScript { public: BaseScript(); ~BaseScript(); - virtual short CallEvent(int event, tOSIRISEventInfo *data); + virtual int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class LevelScript_0000 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_11C4 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_1088 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_09C6 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_11C5 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_09C7 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_182E : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0A05 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0A04 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0A03 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_1A02 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_1033 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_1200 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_1036 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_1035 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_3032 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_1830 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_28A2 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0A06 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_2885 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_107E : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_1185 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_21B2 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_09DE : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_09DD : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_09DC : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_21DA : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0899 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_089A : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_089B : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_1098 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_09A1 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_19A0 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_09C9 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_1007 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_1016 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_000F : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0000 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0010 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_000E : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_000D : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_000B : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0009 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_000C : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_000A : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0007 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class TriggerScript_0008 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; // ====================== @@ -923,8 +923,8 @@ $$END static uint8_t breaking_glass_index = 0; static struct t_breaking_glass_data { - short room_number; - short portal_num; + int16_t room_number; + int16_t portal_num; } breaking_glass_data[64]; #define SPECIAL_TIMER_ID_BASE 1000 @@ -1823,7 +1823,7 @@ void STDCALL DestroyInstance(int id, void *ptr) { // =================== // CallInstanceEvent() // =================== -short STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data) { +int16_t STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data) { switch (id) { case ID_LEVEL_0000: case ID_CUSTOM_OBJECT_11C4: @@ -1993,12 +1993,12 @@ BaseScript::BaseScript() {} BaseScript::~BaseScript() {} -short BaseScript::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t BaseScript::CallEvent(int event, tOSIRISEventInfo *data) { mprintf(0, "BaseScript::CallEvent()\n"); return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_SAVESTATE: { tOSIRISEVTSAVESTATE *event_data = &data->evt_savestate; @@ -2457,7 +2457,7 @@ short LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_11C4::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_11C4::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_AIN_MOVIE_END: { tOSIRISEVTAINOTIFY *event_data = &data->evt_ain_movie_end; @@ -2483,7 +2483,7 @@ short CustomObjectScript_11C4::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_1088::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_1088::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -2505,7 +2505,7 @@ short CustomObjectScript_1088::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_09C6::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_09C6::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_AIN_MOVIE_END: { tOSIRISEVTAINOTIFY *event_data = &data->evt_ain_movie_end; @@ -2523,7 +2523,7 @@ short CustomObjectScript_09C6::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_11C5::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_11C5::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_AIN_MOVIE_END: { tOSIRISEVTAINOTIFY *event_data = &data->evt_ain_movie_end; @@ -2545,7 +2545,7 @@ short CustomObjectScript_11C5::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_09C7::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_09C7::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_AIN_MOVIE_END: { tOSIRISEVTAINOTIFY *event_data = &data->evt_ain_movie_end; @@ -2564,7 +2564,7 @@ short CustomObjectScript_09C7::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_182E::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_182E::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -2608,7 +2608,7 @@ short CustomObjectScript_182E::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0A05::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0A05::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -2634,7 +2634,7 @@ short CustomObjectScript_0A05::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0A04::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0A04::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -2660,7 +2660,7 @@ short CustomObjectScript_0A04::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0A03::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0A03::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -2686,7 +2686,7 @@ short CustomObjectScript_0A03::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_1A02::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_1A02::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -2712,7 +2712,7 @@ short CustomObjectScript_1A02::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_1033::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_1033::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -2750,7 +2750,7 @@ short CustomObjectScript_1033::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_1200::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_1200::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -2786,7 +2786,7 @@ short CustomObjectScript_1200::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_1036::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_1036::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -2809,7 +2809,7 @@ short CustomObjectScript_1036::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_1035::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_1035::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -2831,7 +2831,7 @@ short CustomObjectScript_1035::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_3032::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_3032::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -2853,7 +2853,7 @@ short CustomObjectScript_3032::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_1830::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_1830::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -2875,7 +2875,7 @@ short CustomObjectScript_1830::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_28A2::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_28A2::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -2908,7 +2908,7 @@ short CustomObjectScript_28A2::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0A06::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0A06::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -2933,7 +2933,7 @@ short CustomObjectScript_0A06::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_2885::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_2885::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3038,7 +3038,7 @@ short CustomObjectScript_2885::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_107E::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_107E::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3139,7 +3139,7 @@ short CustomObjectScript_107E::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_1185::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_1185::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3189,7 +3189,7 @@ short CustomObjectScript_1185::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_21B2::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_21B2::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3239,7 +3239,7 @@ short CustomObjectScript_21B2::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_09DE::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_09DE::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3265,7 +3265,7 @@ short CustomObjectScript_09DE::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_09DD::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_09DD::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3291,7 +3291,7 @@ short CustomObjectScript_09DD::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_09DC::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_09DC::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3317,7 +3317,7 @@ short CustomObjectScript_09DC::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_21DA::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_21DA::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3343,7 +3343,7 @@ short CustomObjectScript_21DA::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0899::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0899::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -3364,7 +3364,7 @@ short CustomObjectScript_0899::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_089A::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_089A::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -3385,7 +3385,7 @@ short CustomObjectScript_089A::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_089B::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_089B::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -3406,7 +3406,7 @@ short CustomObjectScript_089B::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_1098::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_1098::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -3427,7 +3427,7 @@ short CustomObjectScript_1098::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_09A1::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_09A1::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3490,7 +3490,7 @@ short CustomObjectScript_09A1::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_19A0::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_19A0::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3573,7 +3573,7 @@ short CustomObjectScript_19A0::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_09C9::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_09C9::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -3600,7 +3600,7 @@ short CustomObjectScript_09C9::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_1007::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_1007::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_TIMER: { tOSIRISEVTTIMER *event_data = &data->evt_timer; @@ -3622,7 +3622,7 @@ short CustomObjectScript_1007::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_1016::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_1016::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3642,7 +3642,7 @@ short CustomObjectScript_1016::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_000F::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_000F::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3663,7 +3663,7 @@ short TriggerScript_000F::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3693,7 +3693,7 @@ short TriggerScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0010::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0010::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3715,7 +3715,7 @@ short TriggerScript_0010::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_000E::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_000E::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3733,7 +3733,7 @@ short TriggerScript_000E::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_000D::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_000D::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3751,7 +3751,7 @@ short TriggerScript_000D::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_000B::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_000B::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3769,7 +3769,7 @@ short TriggerScript_000B::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0009::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0009::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3787,7 +3787,7 @@ short TriggerScript_0009::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_000C::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_000C::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3805,7 +3805,7 @@ short TriggerScript_000C::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_000A::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_000A::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3823,7 +3823,7 @@ short TriggerScript_000A::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0007::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0007::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -3841,7 +3841,7 @@ short TriggerScript_0007::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short TriggerScript_0008::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t TriggerScript_0008::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; diff --git a/scripts/myPowerHouse.cpp b/scripts/myPowerHouse.cpp index 52d3bf6d..328ae5b5 100644 --- a/scripts/myPowerHouse.cpp +++ b/scripts/myPowerHouse.cpp @@ -40,7 +40,7 @@ DLLEXPORT void STDCALL ShutdownDLL(void); DLLEXPORT int STDCALL GetGOScriptID(const char *name, uint8_t is_door); DLLEXPORT void STDCALLPTR CreateInstance(int id); DLLEXPORT void STDCALL DestroyInstance(int id, void *ptr); -DLLEXPORT short STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data); +DLLEXPORT int16_t STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data); DLLEXPORT int STDCALL GetTriggerScriptID(int trigger_room, int trigger_face); DLLEXPORT int STDCALL GetCOScriptList(int **list, int **id_list); DLLEXPORT int STDCALL SaveRestoreState(void *file_ptr, uint8_t saving_state); @@ -63,17 +63,17 @@ class BaseScript { public: BaseScript(); ~BaseScript(); - virtual short CallEvent(int event, tOSIRISEventInfo *data); + virtual int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class LevelScript_0000 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0827 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; // ====================== @@ -470,7 +470,7 @@ void STDCALL DestroyInstance(int id, void *ptr) { // =================== // CallInstanceEvent() // =================== -short STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data) { +int16_t STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data) { switch (id) { case ID_LEVEL_0000: case ID_CUSTOM_OBJECT_0827: @@ -517,12 +517,12 @@ BaseScript::BaseScript() {} BaseScript::~BaseScript() {} -short BaseScript::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t BaseScript::CallEvent(int event, tOSIRISEventInfo *data) { mprintf(0, "BaseScript::CallEvent()\n"); return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_SAVESTATE: { tOSIRISEVTSAVESTATE *event_data = &data->evt_savestate; @@ -546,7 +546,7 @@ short LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0827::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0827::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; diff --git a/scripts/orbital.cpp b/scripts/orbital.cpp index 6f09729e..3b86d387 100644 --- a/scripts/orbital.cpp +++ b/scripts/orbital.cpp @@ -40,7 +40,7 @@ DLLEXPORT void STDCALL ShutdownDLL(void); DLLEXPORT int STDCALL GetGOScriptID(const char *name, uint8_t is_door); DLLEXPORT void STDCALLPTR CreateInstance(int id); DLLEXPORT void STDCALL DestroyInstance(int id, void *ptr); -DLLEXPORT short STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data); +DLLEXPORT int16_t STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data); DLLEXPORT int STDCALL GetTriggerScriptID(int trigger_room, int trigger_face); DLLEXPORT int STDCALL GetCOScriptList(int **list, int **id_list); DLLEXPORT int STDCALL SaveRestoreState(void *file_ptr, uint8_t saving_state); @@ -64,22 +64,22 @@ class BaseScript { public: BaseScript(); ~BaseScript(); - virtual short CallEvent(int event, tOSIRISEventInfo *data); + virtual int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class LevelScript_0000 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_0903 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; class CustomObjectScript_10F9 : public BaseScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; // ====================== @@ -680,7 +680,7 @@ void STDCALL DestroyInstance(int id, void *ptr) { // =================== // CallInstanceEvent() // =================== -short STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data) { +int16_t STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data) { switch (id) { case ID_LEVEL_0000: case ID_CUSTOM_OBJECT_0903: @@ -729,12 +729,12 @@ BaseScript::BaseScript() {} BaseScript::~BaseScript() {} -short BaseScript::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t BaseScript::CallEvent(int event, tOSIRISEventInfo *data) { mprintf(0, "BaseScript::CallEvent()\n"); return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_SAVESTATE: { tOSIRISEVTSAVESTATE *event_data = &data->evt_savestate; @@ -853,7 +853,7 @@ short LevelScript_0000::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_0903::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_0903::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: { tOSIRISEVTCOLLIDE *event_data = &data->evt_collide; @@ -872,7 +872,7 @@ short CustomObjectScript_0903::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -short CustomObjectScript_10F9::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t CustomObjectScript_10F9::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_CREATED: { tOSIRISEVTCREATED *event_data = &data->evt_created; diff --git a/scripts/osiris_import.h b/scripts/osiris_import.h index 80ef486b..50f2740c 100644 --- a/scripts/osiris_import.h +++ b/scripts/osiris_import.h @@ -266,10 +266,10 @@ OSIRISEXTERN File_ReadBytes_fp File_ReadBytes; typedef int (*File_ReadInt_fp)(void *fileptr); OSIRISEXTERN File_ReadInt_fp File_ReadInt; -// short File_ReadShort(void *fileptr); -// Read and return a short (16 bits) +// int16_t File_ReadShort(void *fileptr); +// Read and return a int16_t (16 bits) // Throws an exception of type (cfile_error *) if the OS returns an error on read -typedef short (*File_ReadShort_fp)(void *fileptr); +typedef int16_t (*File_ReadShort_fp)(void *fileptr); OSIRISEXTERN File_ReadShort_fp File_ReadShort; // int8_t File_ReadByte(void *fileptr); @@ -333,10 +333,10 @@ OSIRISEXTERN File_WriteString_fp File_WriteString; typedef void (*File_WriteInt_fp)(int i, void *fileptr); OSIRISEXTERN File_WriteInt_fp File_WriteInt; -// void File_WriteShort(short s,void *fileptr); -// Write a short (16 bits) +// void File_WriteShort(int16_t s,void *fileptr); +// Write a int16_t (16 bits) // Throws an exception of type (cfile_error *) if the OS returns an error on write -typedef void (*File_WriteShort_fp)(short s, void *fileptr); +typedef void (*File_WriteShort_fp)(int16_t s, void *fileptr); OSIRISEXTERN File_WriteShort_fp File_WriteShort; // void File_WriteByte(int8_t b,void *fileptr); diff --git a/scripts/testscript.cpp b/scripts/testscript.cpp index 6e6f7fd7..8b2e7e16 100644 --- a/scripts/testscript.cpp +++ b/scripts/testscript.cpp @@ -34,7 +34,7 @@ DLLEXPORT void STDCALL ShutdownDLL(void); DLLEXPORT int STDCALL GetGOScriptID(const char *name, uint8_t isdoor); DLLEXPORT void STDCALLPTR CreateInstance(int id); DLLEXPORT void STDCALL DestroyInstance(int id, void *ptr); -DLLEXPORT short STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data); +DLLEXPORT int16_t STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data); DLLEXPORT int STDCALL SaveRestoreState(void *file_ptr, uint8_t saving_state); #ifdef __cplusplus } @@ -57,7 +57,7 @@ class BaseObjScript { public: BaseObjScript(); ~BaseObjScript(); - virtual short CallEvent(int event, tOSIRISEventInfo *data); + virtual int16_t CallEvent(int event, tOSIRISEventInfo *data); protected: bool called; @@ -72,7 +72,7 @@ typedef struct { class ShieldOrb : public BaseObjScript { public: ShieldOrb() { info = NULL; } - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); private: tShieldOrbInfo *info; @@ -83,7 +83,7 @@ private: //------------------ class EnergyOrb : public BaseObjScript { public: - short CallEvent(int event, tOSIRISEventInfo *data); + int16_t CallEvent(int event, tOSIRISEventInfo *data); }; char STDCALL InitializeDLL(tOSIRISModuleInit *func_list) { @@ -132,7 +132,7 @@ void STDCALL DestroyInstance(int id, void *ptr) { }; } -short STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data) { +int16_t STDCALL CallInstanceEvent(int id, void *ptr, int event, tOSIRISEventInfo *data) { switch (id) { case ID_SHIELD_ORB: case ID_ENERGY_ORB: @@ -165,7 +165,7 @@ BaseObjScript::BaseObjScript() { called = false; } BaseObjScript::~BaseObjScript() {} -short BaseObjScript::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t BaseObjScript::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_INTERVAL: mprintf(0, "."); @@ -208,7 +208,7 @@ short BaseObjScript::CallEvent(int event, tOSIRISEventInfo *data) { // -------------- // Shield orb // -------------- -short ShieldOrb::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t ShieldOrb::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: if (!called) { @@ -285,7 +285,7 @@ short ShieldOrb::CallEvent(int event, tOSIRISEventInfo *data) { // -------------- // Energy orb // -------------- -short EnergyOrb::CallEvent(int event, tOSIRISEventInfo *data) { +int16_t EnergyOrb::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_COLLIDE: if (!called) { diff --git a/sndlib/ddsoundload.cpp b/sndlib/ddsoundload.cpp index 1fb46289..888286db 100644 --- a/sndlib/ddsoundload.cpp +++ b/sndlib/ddsoundload.cpp @@ -131,8 +131,8 @@ char SoundLoadWaveFile(const char *filename, float percent_volume, int sound_fil // Sound format information int samples_per_second; - short bits_per_sample; - short number_channels; + int16_t bits_per_sample; + int16_t number_channels; // Used to read temporary long values uint32_t temp_long; @@ -398,7 +398,7 @@ char SoundLoadWaveFile(const char *filename, float percent_volume, int sound_fil SoundFiles[sound_file_index].sample_length = cksize / 2 + num_needed / 2; } - SoundFiles[sound_file_index].sample_16bit = (short *)GlobalAlloc(0, cksize + num_needed); + SoundFiles[sound_file_index].sample_16bit = (int16_t *)GlobalAlloc(0, cksize + num_needed); GlobalLock(SoundFiles[sound_file_index].sample_16bit); cf_ReadBytes((uint8_t *)SoundFiles[sound_file_index].sample_16bit, cksize, cfptr); for (count = 0; count < (int)cksize / 2; count++) { @@ -467,14 +467,14 @@ char SoundLoadWaveFile(const char *filename, float percent_volume, int sound_fil } else if (SoundFiles[sound_file_index].sample_16bit == NULL && f_high_quality) { SoundFiles[sound_file_index].sample_16bit = - (short *)GlobalAlloc(0, SoundFiles[sound_file_index].sample_length * sizeof(short)); + (int16_t *)GlobalAlloc(0, SoundFiles[sound_file_index].sample_length * sizeof(int16_t)); GlobalLock(SoundFiles[sound_file_index].sample_16bit); // NOTE: Interesting note on sound conversion: 16 bit sounds are signed (0 biase). 8 bit sounds are unsigned // (+128 biase). for (count = 0; count < (int)SoundFiles[sound_file_index].sample_length; count++) { SoundFiles[sound_file_index].sample_16bit[count] = - (((short)SoundFiles[sound_file_index].sample_8bit[count]) - 128) * 256; + (((int16_t)SoundFiles[sound_file_index].sample_8bit[count]) - 128) * 256; } for (count = 0; count < (int)SoundFiles[sound_file_index].sample_length; count++) { diff --git a/sndlib/ds3dlib.cpp b/sndlib/ds3dlib.cpp index 7894bad3..e147d461 100644 --- a/sndlib/ds3dlib.cpp +++ b/sndlib/ds3dlib.cpp @@ -230,7 +230,7 @@ static void *GameWindowHandle; win_llsSystem *ll_sound_ptr; emulated_listener *g_emulated_listener = NULL; // silly hack (Samir) -short Global_DS_alloced_sounds = 0; +int16_t Global_DS_alloced_sounds = 0; int *Fast_mixer = NULL; int Fast_mixer_len = 0; @@ -333,7 +333,7 @@ inline void opti_8s_mix(uint8_t *cur_sample_8bit, const int num_write, int &samp samples_played += (i / 2); } -inline void opti_16m_mix(short *cur_sample_16bit, const int num_write, int &samples_played, int *mixer_buffer16, +inline void opti_16m_mix(int16_t *cur_sample_16bit, const int num_write, int &samples_played, int *mixer_buffer16, const float l_volume, const float r_volume) { int i; int *mb = mixer_buffer16; @@ -360,7 +360,7 @@ inline void opti_16m_mix(short *cur_sample_16bit, const int num_write, int &samp samples_played += (i / 2); } -inline void opti_16s_mix(short *cur_sample_16bit, const int num_write, int &samples_played, int *mixer_buffer16, +inline void opti_16s_mix(int16_t *cur_sample_16bit, const int num_write, int &samples_played, int *mixer_buffer16, const float l_volume, const float r_volume) { int i; int *mb = mixer_buffer16; @@ -632,7 +632,7 @@ bool sb_load_buffer(sound_buffer_info *sb, void *sample_data, int length) { // mixing and effects (writes data to the locked primary buffer) void StreamMixer(char *ptr, int len) { int i; - short *mixer_buffer16 = (short *)ptr; + int16_t *mixer_buffer16 = (int16_t *)ptr; int current_slot = 0; bool f_loop; bool f_mono; @@ -659,7 +659,7 @@ void StreamMixer(char *ptr, int len) { while (current_slot < ll_sound_ptr->m_sound_mixer.m_max_sounds_played) { sound_buffer_info *cur_buf = &ll_sound_ptr->m_sound_mixer.m_sound_cache[current_slot]; int num_samples = buff_len; - // mixer_buffer16 = (short *) ptr; + // mixer_buffer16 = (int16_t *) ptr; fast_mix_ptr = Fast_mixer; f_mono = true; @@ -669,7 +669,7 @@ void StreamMixer(char *ptr, int len) { float r_volume = cur_buf->play_info->right_volume; int skip_interval = cur_buf->play_info->sample_skip_interval; int samples_played = cur_buf->play_info->m_samples_played; - short *sample_16bit; + int16_t *sample_16bit; uint8_t *sample_8bit; int np_sample_length; int sample_length; @@ -679,7 +679,7 @@ void StreamMixer(char *ptr, int len) { if (cur_buf->m_status & SSF_PLAY_STREAMING) { switch (cur_buf->play_info->m_stream_format) { case SIF_STREAMING_16_M: - sample_16bit = (short *)cur_buf->play_info->m_stream_data; + sample_16bit = (int16_t *)cur_buf->play_info->m_stream_data; sample_8bit = NULL; np_sample_length = sample_length = cur_buf->play_info->m_stream_size / 2; break; @@ -689,7 +689,7 @@ void StreamMixer(char *ptr, int len) { np_sample_length = sample_length = cur_buf->play_info->m_stream_size; break; case SIF_STREAMING_16_S: - sample_16bit = (short *)cur_buf->play_info->m_stream_data; + sample_16bit = (int16_t *)cur_buf->play_info->m_stream_data; sample_8bit = NULL; np_sample_length = sample_length = cur_buf->play_info->m_stream_size / 4; f_mono = false; @@ -824,7 +824,7 @@ void StreamMixer(char *ptr, int len) { // Mix at 16 bits per sample if (skip_interval == 0) { - short *cur_sample_16bit = sample_16bit; + int16_t *cur_sample_16bit = sample_16bit; uint8_t *cur_sample_8bit = sample_8bit; if (f_mono) { @@ -955,7 +955,7 @@ void StreamMixer(char *ptr, int len) { if (cur_buf->play_info->m_stream_data) { switch (cur_buf->play_info->m_stream_format) { case SIF_STREAMING_16_M: - sample_16bit = (short *)cur_buf->play_info->m_stream_data; + sample_16bit = (int16_t *)cur_buf->play_info->m_stream_data; loop_end = sample_length = np_sample_length = cur_buf->play_info->m_stream_size / 2; break; case SIF_STREAMING_8_M: @@ -963,7 +963,7 @@ void StreamMixer(char *ptr, int len) { loop_end = sample_length = np_sample_length = cur_buf->play_info->m_stream_size; break; case SIF_STREAMING_16_S: - sample_16bit = (short *)cur_buf->play_info->m_stream_data; + sample_16bit = (int16_t *)cur_buf->play_info->m_stream_data; loop_end = sample_length = np_sample_length = cur_buf->play_info->m_stream_size / 4; break; case SIF_STREAMING_8_S: @@ -1918,9 +1918,9 @@ TryLockAgainLabel: // ignore reserved slots #ifdef _DEBUG -short win_llsSystem::FindFreeSoundSlot(int sound_index, float volume, int priority) +int16_t win_llsSystem::FindFreeSoundSlot(int sound_index, float volume, int priority) #else -short win_llsSystem::FindFreeSoundSlot(float volume, int priority) +int16_t win_llsSystem::FindFreeSoundSlot(float volume, int priority) #endif { int current_slot; @@ -2000,7 +2000,7 @@ short win_llsSystem::FindFreeSoundSlot(float volume, int priority) int win_llsSystem::PlaySound2d(play_information *play_info, int sound_index, float f_volume, float f_pan, bool f_looped) { sound_buffer_info *sb = NULL; - short sound_slot; + int16_t sound_slot; if (!m_f_sound_lib_init) { return -1; @@ -2265,7 +2265,7 @@ void win_llsSystem::DSStartStreaming(sound_buffer_info *sb, float volume, float } int win_llsSystem::PlayStream(play_information *play_info) { - short sound_slot; + int16_t sound_slot; DWORD ds_flags = 0; ASSERT(play_info != NULL); @@ -2801,7 +2801,7 @@ void win_llsSystem::AdjustSound(int sound_uid, pos_state *cur_pos, float adjuste int win_llsSystem::PlaySound3d(play_information *play_info, int sound_index, pos_state *cur_pos, float adjusted_volume, bool f_looped, float reverb) { - short sound_slot; + int16_t sound_slot; DWORD ds_flags = 0; float volume; diff --git a/sndlib/ds3dlib.h b/sndlib/ds3dlib.h index 5e629f98..173024fd 100644 --- a/sndlib/ds3dlib.h +++ b/sndlib/ds3dlib.h @@ -288,9 +288,9 @@ private: // Finds a free slot for a new sound, slot_uid is an SBID_xxx value. #ifdef _DEBUG - short FindFreeSoundSlot(int sound_index, float volume, int priority); + int16_t FindFreeSoundSlot(int sound_index, float volume, int priority); #else - short FindFreeSoundSlot(float volume, int priority); + int16_t FindFreeSoundSlot(float volume, int priority); #endif // updates a directsound buffer diff --git a/sndlib/ds3dlib_internal.h b/sndlib/ds3dlib_internal.h index cdba22f7..0032eb17 100644 --- a/sndlib/ds3dlib_internal.h +++ b/sndlib/ds3dlib_internal.h @@ -156,8 +156,8 @@ public: LPDIRECTSOUND3DBUFFER m_sound_buffer_3d; // Used for 3d interface LPKSPROPERTYSET m_lpksps; // used mainly for EAX 2.0 but is a direct sound object. - short m_mixer_type; // aureal, ds3d, ds_8? - short m_buffer_type; // Buffer type 2d or 3d + int16_t m_mixer_type; // aureal, ds3d, ds_8? + int16_t m_buffer_type; // Buffer type 2d or 3d char *sample_data; int sample_length; // used for storage purposes. diff --git a/sndlib/dsound3d.cpp b/sndlib/dsound3d.cpp index 924a6bba..48c3a029 100644 --- a/sndlib/dsound3d.cpp +++ b/sndlib/dsound3d.cpp @@ -59,7 +59,7 @@ static struct t_sb_loop_thread_data { win_llsSystem *m_ll_sndsys; uintptr_t thread_handle; - short no_callbacks; + int16_t no_callbacks; bool request_kill; bool thread_alive; } m_ds; diff --git a/sndlib/hlsoundlib.cpp b/sndlib/hlsoundlib.cpp index e197ce84..4e1b6891 100644 --- a/sndlib/hlsoundlib.cpp +++ b/sndlib/hlsoundlib.cpp @@ -645,7 +645,7 @@ void hlsSystem::StopAllSounds() { void hlsSystem::BeginSoundFrame(bool f_in_game) { bool hwsound_support; // if this is true, sound_render_system is being used - short *sound_room_list; // these values are only meant for sound render system + int16_t *sound_room_list; // these values are only meant for sound render system int i, n, counter = 0; pos_state listener_pos; const int num_samples_this_frame = (int)(Frametime * 22050); diff --git a/sndlib/mixer.cpp b/sndlib/mixer.cpp index 37e943d2..ddc869fd 100644 --- a/sndlib/mixer.cpp +++ b/sndlib/mixer.cpp @@ -29,13 +29,13 @@ #define VOLUME_FIX_BITS 1024 static inline void opti_8m_mix(uint8_t *cur_sample_8bit, const int num_write, int &samples_played, - short *mixer_buffer16, const float l_volume, const float r_volume); + int16_t *mixer_buffer16, const float l_volume, const float r_volume); static inline void opti_8s_mix(uint8_t *cur_sample_8bit, const int num_write, int &samples_played, - short *mixer_buffer16, const float l_volume, const float r_volume); -static inline void opti_16m_mix(short *cur_sample_16bit, const int num_write, int &samples_played, - short *mixer_buffer16, const float l_volume, const float r_volume); -static inline void opti_16s_mix(short *cur_sample_16bit, const int num_write, int &samples_played, - short *mixer_buffer16, const float l_volume, const float r_volume); + int16_t *mixer_buffer16, const float l_volume, const float r_volume); +static inline void opti_16m_mix(int16_t *cur_sample_16bit, const int num_write, int &samples_played, + int16_t *mixer_buffer16, const float l_volume, const float r_volume); +static inline void opti_16s_mix(int16_t *cur_sample_16bit, const int num_write, int &samples_played, + int16_t *mixer_buffer16, const float l_volume, const float r_volume); software_mixer::software_mixer() { m_init = false; @@ -104,7 +104,7 @@ void software_mixer::DoFrame(void) { // mixing and effects (writes data to the locked primary buffer) void software_mixer::StreamMixer(char *ptr, int len) { int i; - short *mixer_buffer16 = (short *)ptr; + int16_t *mixer_buffer16 = (int16_t *)ptr; int current_slot = 0; bool f_loop; bool f_mono; @@ -133,7 +133,7 @@ void software_mixer::StreamMixer(char *ptr, int len) { while (current_slot < (*m_max_sounds_available)) { sound_buffer_info *cur_buf = &m_sound_cache[current_slot]; int num_samples = buff_len; - mixer_buffer16 = (short *)ptr; + mixer_buffer16 = (int16_t *)ptr; f_mono = true; // Find slots with sounds in them @@ -142,7 +142,7 @@ void software_mixer::StreamMixer(char *ptr, int len) { float r_volume = cur_buf->play_info->right_volume; int skip_interval = cur_buf->play_info->sample_skip_interval; int samples_played = cur_buf->play_info->m_samples_played; - short *sample_16bit; + int16_t *sample_16bit; uint8_t *sample_8bit; int np_sample_length = 0; int sample_length; @@ -152,7 +152,7 @@ void software_mixer::StreamMixer(char *ptr, int len) { if (cur_buf->m_status & SSF_PLAY_STREAMING) { switch (cur_buf->play_info->m_stream_format) { case SIF_STREAMING_16_M: - sample_16bit = (short *)cur_buf->play_info->m_stream_data; + sample_16bit = (int16_t *)cur_buf->play_info->m_stream_data; sample_8bit = NULL; np_sample_length = sample_length = cur_buf->play_info->m_stream_size / 2; break; @@ -162,7 +162,7 @@ void software_mixer::StreamMixer(char *ptr, int len) { np_sample_length = sample_length = cur_buf->play_info->m_stream_size; break; case SIF_STREAMING_16_S: - sample_16bit = (short *)cur_buf->play_info->m_stream_data; + sample_16bit = (int16_t *)cur_buf->play_info->m_stream_data; sample_8bit = NULL; np_sample_length = sample_length = cur_buf->play_info->m_stream_size / 4; f_mono = false; @@ -292,7 +292,7 @@ void software_mixer::StreamMixer(char *ptr, int len) { // Mix at 16 bits per sample if (skip_interval == 0) { - short *cur_sample_16bit = sample_16bit; + int16_t *cur_sample_16bit = sample_16bit; uint8_t *cur_sample_8bit = sample_8bit; if (f_mono) { @@ -349,8 +349,8 @@ void software_mixer::StreamMixer(char *ptr, int len) { if (r_sample > 32767) r_sample = 32767; - mixer_buffer16[i] = (short)l_sample; - mixer_buffer16[i + 1] = (short)r_sample; + mixer_buffer16[i] = (int16_t)l_sample; + mixer_buffer16[i + 1] = (int16_t)r_sample; } } else { for (i = 0; i < (num_write << 1); i += 2) { @@ -411,8 +411,8 @@ void software_mixer::StreamMixer(char *ptr, int len) { if (r_sample > 32767) r_sample = 32767; - mixer_buffer16[i] = (short)l_sample; - mixer_buffer16[i + 1] = (short)r_sample; + mixer_buffer16[i] = (int16_t)l_sample; + mixer_buffer16[i + 1] = (int16_t)r_sample; } } } @@ -436,7 +436,7 @@ void software_mixer::StreamMixer(char *ptr, int len) { if (cur_buf->play_info->m_stream_data) { switch (cur_buf->play_info->m_stream_format) { case SIF_STREAMING_16_M: - sample_16bit = (short *)cur_buf->play_info->m_stream_data; + sample_16bit = (int16_t *)cur_buf->play_info->m_stream_data; loop_end = sample_length = np_sample_length = cur_buf->play_info->m_stream_size / 2; break; case SIF_STREAMING_8_M: @@ -444,7 +444,7 @@ void software_mixer::StreamMixer(char *ptr, int len) { loop_end = sample_length = np_sample_length = cur_buf->play_info->m_stream_size; break; case SIF_STREAMING_16_S: - sample_16bit = (short *)cur_buf->play_info->m_stream_data; + sample_16bit = (int16_t *)cur_buf->play_info->m_stream_data; loop_end = sample_length = np_sample_length = cur_buf->play_info->m_stream_size / 4; break; case SIF_STREAMING_8_S: @@ -485,17 +485,17 @@ void software_mixer::StreamMixer(char *ptr, int len) { } } -inline void opti_8m_mix(uint8_t *cur_sample_8bit, const int num_write, int &samples_played, short *mixer_buffer16, +inline void opti_8m_mix(uint8_t *cur_sample_8bit, const int num_write, int &samples_played, int16_t *mixer_buffer16, const float l_volume, const float r_volume) { int i; - short *mb = mixer_buffer16; + int16_t *mb = mixer_buffer16; for (i = 0; i < (num_write << 1); i += 2) { - short sample; + int16_t sample; int l_sample; int r_sample; - sample = (((short)(*cur_sample_8bit)) - (short)128) << 8; + sample = (((int16_t)(*cur_sample_8bit)) - (int16_t)128) << 8; cur_sample_8bit++; l_sample = *mb + (sample * l_volume); @@ -512,27 +512,27 @@ inline void opti_8m_mix(uint8_t *cur_sample_8bit, const int num_write, int &samp if (r_sample > 32767) r_sample = 32767; - *mb = (short)l_sample; + *mb = (int16_t)l_sample; mb++; - *mb = (short)r_sample; + *mb = (int16_t)r_sample; mb++; } } -inline void opti_8s_mix(uint8_t *cur_sample_8bit, const int num_write, int &samples_played, short *mixer_buffer16, +inline void opti_8s_mix(uint8_t *cur_sample_8bit, const int num_write, int &samples_played, int16_t *mixer_buffer16, const float l_volume, const float r_volume) { int i; - short *mb = mixer_buffer16; + int16_t *mb = mixer_buffer16; for (i = 0; i < (num_write << 1); i += 2) { - short lsample; - short rsample; + int16_t lsample; + int16_t rsample; int l_sample; int r_sample; - lsample = (((short)(*cur_sample_8bit)) - (short)128) << 8; + lsample = (((int16_t)(*cur_sample_8bit)) - (int16_t)128) << 8; cur_sample_8bit++; - rsample = (((short)(*cur_sample_8bit)) - (short)128) << 8; + rsample = (((int16_t)(*cur_sample_8bit)) - (int16_t)128) << 8; cur_sample_8bit++; l_sample = *mb + (lsample * l_volume); @@ -549,20 +549,20 @@ inline void opti_8s_mix(uint8_t *cur_sample_8bit, const int num_write, int &samp if (r_sample > 32767) r_sample = 32767; - *mb = (short)l_sample; + *mb = (int16_t)l_sample; mb++; - *mb = (short)r_sample; + *mb = (int16_t)r_sample; mb++; } } -inline void opti_16m_mix(short *cur_sample_16bit, const int num_write, int &samples_played, short *mixer_buffer16, +inline void opti_16m_mix(int16_t *cur_sample_16bit, const int num_write, int &samples_played, int16_t *mixer_buffer16, const float l_volume, const float r_volume) { int i; - short *mb = mixer_buffer16; + int16_t *mb = mixer_buffer16; for (i = 0; i < (num_write << 1); i += 2) { - short sample; + int16_t sample; int l_sample; int r_sample; @@ -583,21 +583,21 @@ inline void opti_16m_mix(short *cur_sample_16bit, const int num_write, int &samp if (r_sample > 32767) r_sample = 32767; - *mb = (short)l_sample; + *mb = (int16_t)l_sample; mb++; - *mb = (short)r_sample; + *mb = (int16_t)r_sample; mb++; } } -inline void opti_16s_mix(short *cur_sample_16bit, const int num_write, int &samples_played, short *mixer_buffer16, +inline void opti_16s_mix(int16_t *cur_sample_16bit, const int num_write, int &samples_played, int16_t *mixer_buffer16, const float l_volume, const float r_volume) { int i; - short *mb = mixer_buffer16; + int16_t *mb = mixer_buffer16; for (i = 0; i < (num_write << 1); i += 2) { - short lsample; - short rsample; + int16_t lsample; + int16_t rsample; int l_sample; int r_sample; @@ -620,9 +620,9 @@ inline void opti_16s_mix(short *cur_sample_16bit, const int num_write, int &samp if (r_sample > 32767) r_sample = 32767; - *mb = (short)l_sample; + *mb = (int16_t)l_sample; mb++; - *mb = (short)r_sample; + *mb = (int16_t)r_sample; *mb++; } } diff --git a/sndlib/mixer.h b/sndlib/mixer.h index f06f90a6..8c47f37d 100644 --- a/sndlib/mixer.h +++ b/sndlib/mixer.h @@ -61,8 +61,8 @@ public: // Not needed by the software mixer volatile DSLOOPSTREAM *s; // Streaming info for a looping sample - short m_mixer_type; // ds3d, ds_8? - short m_buffer_type; // Buffer type 2d or 3d + int16_t m_mixer_type; // ds3d, ds_8? + int16_t m_buffer_type; // Buffer type 2d or 3d char *sample_data; int sample_length; // used for storage purposes. diff --git a/sndlib/sdlsound.cpp b/sndlib/sdlsound.cpp index 0b5fc1b1..6f2deac6 100644 --- a/sndlib/sdlsound.cpp +++ b/sndlib/sdlsound.cpp @@ -201,9 +201,9 @@ char lnxsound::GetSoundMixer() { return SOUND_MIXER_SOFTWARE_16; } // Also put prioritization code in here // ignore reserved slots #ifdef _DEBUG -short lnxsound::FindFreeSoundSlot(int sound_index, float volume, int priority) +int16_t lnxsound::FindFreeSoundSlot(int sound_index, float volume, int priority) #else -short lnxsound::FindFreeSoundSlot(float volume, int priority) +int16_t lnxsound::FindFreeSoundSlot(float volume, int priority) #endif { int current_slot; @@ -270,7 +270,7 @@ short lnxsound::FindFreeSoundSlot(float volume, int priority) // Plays a 2d sound int lnxsound::PlaySound2d(play_information *play_info, int sound_index, float f_volume, float f_pan, bool f_looped) { sound_buffer_info *sb; - short sound_slot; + int16_t sound_slot; if (sound_device == 0) { return -1; @@ -330,7 +330,7 @@ inline int lnxsound::ValidateUniqueId(int sound_uid) { } int lnxsound::PlayStream(play_information *play_info) { - short sound_slot; + int16_t sound_slot; ASSERT(play_info != nullptr); diff --git a/sndlib/sdlsound.h b/sndlib/sdlsound.h index 647bb1c7..31dcf9b8 100644 --- a/sndlib/sdlsound.h +++ b/sndlib/sdlsound.h @@ -126,9 +126,9 @@ public: protected: #ifdef _DEBUG - short FindFreeSoundSlot(int sound_index, float volume, int priority); + int16_t FindFreeSoundSlot(int sound_index, float volume, int priority); #else - short FindFreeSoundSlot(float volume, int priority); + int16_t FindFreeSoundSlot(float volume, int priority); #endif // This function limits the number of sounds cached to 255(8bits) and 256 bit is for invalid channel // The purpose is to create unique signatures for each sound played (and allow for diff --git a/sndlib/sndrender.cpp b/sndlib/sndrender.cpp index 0d9ffc34..42b865c4 100644 --- a/sndlib/sndrender.cpp +++ b/sndlib/sndrender.cpp @@ -64,7 +64,7 @@ static llsGeometry *Geometry = NULL; -static short Sound_room_list[SOUND_RENDER_ROOM_LIMIT + 1]; +static int16_t Sound_room_list[SOUND_RENDER_ROOM_LIMIT + 1]; // resets sound geometry system (called beginning of each level) void SoundRenderReset() { Sound_room_list[0] = -1; } @@ -175,11 +175,11 @@ void sound_render_room_geometry(int iroom, int slot) { // next portal // end routine // -short *sound_render_audible_rooms(pos_state *listener_pos, float max_radius) { +int16_t *sound_render_audible_rooms(pos_state *listener_pos, float max_radius) { int iroom = 0; sound_render_room_geometry(listener_pos->roomnum, iroom); Sound_room_list[iroom + 1] = -1; - return (short *)Sound_room_list; + return (int16_t *)Sound_room_list; } diff --git a/sndlib/sndrender.h b/sndlib/sndrender.h index fd63f105..df658d65 100644 --- a/sndlib/sndrender.h +++ b/sndlib/sndrender.h @@ -55,13 +55,13 @@ void sound_render_end_frame(); // the radius is actually scaled according to orientation. radius is maximum radius, really, which is forward // minimum radius will be rear view. // returns list of rooms rendered (-1 = end of list!) -short *sound_render_audible_rooms(pos_state *listener_pos, float max_radius = SOUND_RENDER_RADIUS); +int16_t *sound_render_audible_rooms(pos_state *listener_pos, float max_radius = SOUND_RENDER_RADIUS); // render one room's geometry void sound_render_room_geometry(int roomnum, int slot); // check if a room exists in room list. -inline bool sound_render_room_in_list(short room, short *list) { +inline bool sound_render_room_in_list(int16_t room, int16_t *list) { int8_t idx = 0; while (list[idx] != -1) { if (room == list[idx]) { diff --git a/sndlib/ssl_lib.h b/sndlib/ssl_lib.h index dba3e9bf..f93030df 100644 --- a/sndlib/ssl_lib.h +++ b/sndlib/ssl_lib.h @@ -314,7 +314,7 @@ typedef struct sound_file_info { int use_count; // how many buffers does this sound take up. uint8_t *sample_8bit; // 8bit sound data - short *sample_16bit; // 16bit sound data + int16_t *sample_16bit; // 16bit sound data int sample_length; // Length of sound in samples int np_sample_length; // non-padded diff --git a/stream_audio/streamaudio.h b/stream_audio/streamaudio.h index 0ddc6631..80e3e2e4 100644 --- a/stream_audio/streamaudio.h +++ b/stream_audio/streamaudio.h @@ -251,14 +251,14 @@ class AudioStream { uint8_t m_playcount; bool m_readahead; // if stream is currently reading from disk bool m_readahead_finished_loop; // if a loop's readahead has finished - short m_nbufs; // number of buffers streamed so far. + int16_t m_nbufs; // number of buffers streamed so far. play_information m_playinfo; // used by llsSystem float m_volume; // volume of stream. - short m_state, m_laststate; // current state of stream playing + int16_t m_state, m_laststate; // current state of stream playing int m_llshandle; // internal sound handle. int m_flags; // stream playing options. - short m_streamindex; // index into active stream table. - short m_loopcount; // loop counter. + int16_t m_streamindex; // index into active stream table. + int16_t m_loopcount; // loop counter. int m_bytesleft; // number of bytes left in file int m_curmeasure; // current measure. int m_playbytesleft, m_playbytestotal; diff --git a/win32/winapp.cpp b/win32/winapp.cpp index f46c5529..001d7f1a 100644 --- a/win32/winapp.cpp +++ b/win32/winapp.cpp @@ -175,7 +175,7 @@ static struct tAppNodes { } Win32_AppObjects[MAX_WIN32APPS]; // system mouse info. -short w32_msewhl_delta = 0; // -val = up, pos val = down, 0 = no change. +int16_t w32_msewhl_delta = 0; // -val = up, pos val = down, 0 = no change. bool w32_mouseman_hack = false; const uint32_t kWindowStyle_Windowed = WS_OVERLAPPED | WS_CAPTION | WS_SYSMENU | WS_BORDER | WS_MINIMIZEBOX; const uint32_t kWindowStyle_FullScreen = WS_POPUP | WS_SYSMENU; @@ -685,7 +685,7 @@ LRESULT WINAPI MyWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) { if (msg != 0xcc41) { w32_msewhl_delta = HIWORD(wParam); } else { - w32_msewhl_delta = (short)(wParam); + w32_msewhl_delta = (int16_t)(wParam); } } else if (msg == WM_MOUSEWHEEL) { w32_msewhl_delta = HIWORD(wParam); diff --git a/win32/windata.cpp b/win32/windata.cpp index fd52eb7c..93e3a6cb 100644 --- a/win32/windata.cpp +++ b/win32/windata.cpp @@ -199,7 +199,7 @@ bool oeWin32AppDatabase::read(const char *label, void *entry, int wordsize) { *((char *)entry) = (char)t; break; case 2: - *((short *)entry) = (short)t; + *((int16_t *)entry) = (int16_t)t; break; case 4: *((int *)entry) = (int)t;