diff --git a/source/games/whaven/src/names.cpp b/source/games/whaven/src/names.cpp
index 64ef10bad..36bb657c9 100644
--- a/source/games/whaven/src/names.cpp
+++ b/source/games/whaven/src/names.cpp
@@ -4,166 +4,166 @@
 
 BEGIN_WH_NS
 
-short KNIFEREADY;
-short KNIFEATTACK;
-short RFIST;
-short SWORDATTACK;
-short MORNINGSTAR;
-short BOWREADY;
-short BOWREADYEND;
-short BOWWALK;
-short KNIFEATTACK2;
-short SWORDPULL;
-short SWORDATTACK2;
-short MORNINGATTACK2;
-short MUMEDUSA;
-short MUTWOHANDS;
-short BMUTWOHANDS;
-short GOBSWORDPULL;
-short GOBSWORDATTACK;
-short GOBSWORDATTACK2;
-short BIGAXEATTACK;
-short BIGAXEATTACK2;
-short BIGAXEDRAW;
-short HALBERDATTACK1;
-short HALBERDATTACK2;
-short HALBERDDRAW;
-short PIKEDRAW;
-short PIKEATTACK1;
-short EXCALATTACK1;
-short EXCALATTACK2;
-short EXCALDRAW;
-short BIGAXEDRAW9;
-short BIGAXEDRAW10;
-short GEARS2START;
-short HORNEDSKULL;
-short THEFONT;
-short CRYSTALSTAFF;
-short TORCH;
-short WEAPON1;
-short WEAPON1A;
-short AMULETOFTHEMIST;
-short WEAPON2;
-short BRASSKEY;
-short BLACKKEY;
-short GLASSKEY;
-short IVORYKEY;
-short NEWCHUNK;
-short BOWLOFFIRE;
-short SPAWNFIREBALL;
-short PENTAGRAM;
-short THEHORN;
-short BOW;
-short SWINGGATE3;
-short PLATEARMOR;
-short HELMET;
-short CHAINMAIL;
-short SCROLLSCARE;
-short SCROLLNUKE;
-short SCROLLFLY;
-short SCROLLFIREBALL;
-short SCROLLFREEZE;
-short SCROLLNIGHT;
-short SCROLLMAGIC;
-short SCROLLOPEN;
-short LEATHERARMOR;
-short QUIVER;
-short SWINGGATE4;
-short SWINGGATE5;
-short SMOKEFX;
-short STANDINTORCH;
-short PENTADOOR3;
-short PENTADOOR4;
-short PENTADOOR5;
-short PENTADOOR6;
-short PENTADOOR7;
-short SCARY;
-short FISH;
-short LEVERUP;
-short LEVERDOWN;
-short SPAWNJAVLIN;
-short RAT;
-short GUARDIAN;
-short GUARDIANATTACK;
-short DART;
-short WEAPON4;
-short WEAPON6;
-short WEAPON5;
-short WEAPON5B;
-short THROWHALBERD;
-short WEAPON7;
-short THROWPIKE;
-short EXPLO2;
-short SHATTERVASE;
-short SHATTERVASE2;
-short SHATTERVASE3;
-short HANGMAN;
-short SKELETON;
-short SKELETONATTACK;
-short SKELETONSKULL;
-short SKELETONUP;
-short SKELETONDIE;
-short SKELETONDEAD;
-short BONECHUNK1;
-short BONECHUNKEND;
-short PIKEATTACK2;
-short GOBWEAPON;
-short SFLASKBLUE;
-short SFLASKGREEN;
-short SFLASKOCHRE;
-short SFLASKRED;
-short SFLASKTAN;
-short SFLASKBLACK;
-short SPOTIONBACKPIC;
-short SPOTIONARROW;
-short SSPELLBOOKBLANK;
-short SSPELLBOOK2;
-short SSPELLBOOK3;
-short SSPELLBOOK4;
-short SSPELLBOOK5;
-short SSPELLBOOK6;
-short SSPELLBOOK7;
-short SSPELLBOOK8;
-short SARROWS;
-short SPLAYERLVL;
-short SSTATUSBAR;
-short SKEYBLANK;
-short SKEYBRASS;
-short SKEYBLACK;
-short SKEYGLASS;
-short SKEYIVORY;
-short SHEALTHBACK;
-short SSCOREBACKPIC;
-short SNDEFFECT;
-short SNDLOOP;
-short SNDLOOPOFF;
-short BROWNCHUNKSTART;
-short GREYCHUNKSTART;
-short REDCHUNKSTART;
-short GREENCHUNKSTART;
-short TANCHUNKSTART;
-short WILLOW;
-short SPIKES;
-short STHEFLAG;
-short GRONHALATTACK;
-short GRONHALATTACKEND;
-short GROLHALREADY;
-short GRONHALREADYEND;
-short GRONHAL;
-short GRONHALPAIN;
-short GRONHALDIE;
-short GRONSWATTACK;
-short GRONSW;
-short GRONSWPAIN;
-short GRONSWDIE;
-short GRONMUATTACK;
-short GRONDIE;
-short GRONDEAD;
-short GRONMU;
-short GRONMUPAIN;
-short GRONMUDIE;
-short GRONSHIELD;
-short SHIELD;
+int KNIFEREADY;
+int KNIFEATTACK;
+int RFIST;
+int SWORDATTACK;
+int MORNINGSTAR;
+int BOWREADY;
+int BOWREADYEND;
+int BOWWALK;
+int KNIFEATTACK2;
+int SWORDPULL;
+int SWORDATTACK2;
+int MORNINGATTACK2;
+int MUMEDUSA;
+int MUTWOHANDS;
+int BMUTWOHANDS;
+int GOBSWORDPULL;
+int GOBSWORDATTACK;
+int GOBSWORDATTACK2;
+int BIGAXEATTACK;
+int BIGAXEATTACK2;
+int BIGAXEDRAW;
+int HALBERDATTACK1;
+int HALBERDATTACK2;
+int HALBERDDRAW;
+int PIKEDRAW;
+int PIKEATTACK1;
+int EXCALATTACK1;
+int EXCALATTACK2;
+int EXCALDRAW;
+int BIGAXEDRAW9;
+int BIGAXEDRAW10;
+int GEARS2START;
+int HORNEDSKULL;
+int THEFONT;
+int CRYSTALSTAFF;
+int TORCH;
+int WEAPON1;
+int WEAPON1A;
+int AMULETOFTHEMIST;
+int WEAPON2;
+int BRASSKEY;
+int BLACKKEY;
+int GLASSKEY;
+int IVORYKEY;
+int NEWCHUNK;
+int BOWLOFFIRE;
+int SPAWNFIREBALL;
+int PENTAGRAM;
+int THEHORN;
+int BOW;
+int SWINGGATE3;
+int PLATEARMOR;
+int HELMET;
+int CHAINMAIL;
+int SCROLLSCARE;
+int SCROLLNUKE;
+int SCROLLFLY;
+int SCROLLFIREBALL;
+int SCROLLFREEZE;
+int SCROLLNIGHT;
+int SCROLLMAGIC;
+int SCROLLOPEN;
+int LEATHERARMOR;
+int QUIVER;
+int SWINGGATE4;
+int SWINGGATE5;
+int SMOKEFX;
+int STANDINTORCH;
+int PENTADOOR3;
+int PENTADOOR4;
+int PENTADOOR5;
+int PENTADOOR6;
+int PENTADOOR7;
+int SCARY;
+int FISH;
+int LEVERUP;
+int LEVERDOWN;
+int SPAWNJAVLIN;
+int RAT;
+int GUARDIAN;
+int GUARDIANATTACK;
+int DART;
+int WEAPON4;
+int WEAPON6;
+int WEAPON5;
+int WEAPON5B;
+int THROWHALBERD;
+int WEAPON7;
+int THROWPIKE;
+int EXPLO2;
+int SHATTERVASE;
+int SHATTERVASE2;
+int SHATTERVASE3;
+int HANGMAN;
+int SKELETON;
+int SKELETONATTACK;
+int SKELETONSKULL;
+int SKELETONUP;
+int SKELETONDIE;
+int SKELETONDEAD;
+int BONECHUNK1;
+int BONECHUNKEND;
+int PIKEATTACK2;
+int GOBWEAPON;
+int SFLASKBLUE;
+int SFLASKGREEN;
+int SFLASKOCHRE;
+int SFLASKRED;
+int SFLASKTAN;
+int SFLASKBLACK;
+int SPOTIONBACKPIC;
+int SPOTIONARROW;
+int SSPELLBOOKBLANK;
+int SSPELLBOOK2;
+int SSPELLBOOK3;
+int SSPELLBOOK4;
+int SSPELLBOOK5;
+int SSPELLBOOK6;
+int SSPELLBOOK7;
+int SSPELLBOOK8;
+int SARROWS;
+int SPLAYERLVL;
+int SSTATUSBAR;
+int SKEYBLANK;
+int SKEYBRASS;
+int SKEYBLACK;
+int SKEYGLASS;
+int SKEYIVORY;
+int SHEALTHBACK;
+int SSCOREBACKPIC;
+int SNDEFFECT;
+int SNDLOOP;
+int SNDLOOPOFF;
+int BROWNCHUNKSTART;
+int GREYCHUNKSTART;
+int REDCHUNKSTART;
+int GREENCHUNKSTART;
+int TANCHUNKSTART;
+int WILLOW;
+int SPIKES;
+int STHEFLAG;
+int GRONHALATTACK;
+int GRONHALATTACKEND;
+int GROLHALREADY;
+int GRONHALREADYEND;
+int GRONHAL;
+int GRONHALPAIN;
+int GRONHALDIE;
+int GRONSWATTACK;
+int GRONSW;
+int GRONSWPAIN;
+int GRONSWDIE;
+int GRONMUATTACK;
+int GRONDIE;
+int GRONDEAD;
+int GRONMU;
+int GRONMUPAIN;
+int GRONMUDIE;
+int GRONSHIELD;
+int SHIELD;
 
 
 #define x(a, b) registerName(#a, b);
diff --git a/source/games/whaven/src/names.h b/source/games/whaven/src/names.h
index 0371dd7a0..c23ebbc69 100644
--- a/source/games/whaven/src/names.h
+++ b/source/games/whaven/src/names.h
@@ -224,165 +224,165 @@ enum Names {
 };
 
 
-extern short KNIFEREADY;
-extern short KNIFEATTACK;
-extern short RFIST;
-extern short SWORDATTACK;
-extern short MORNINGSTAR;
-extern short BOWREADY;
-extern short BOWREADYEND;
-extern short BOWWALK;
-extern short KNIFEATTACK2;
-extern short SWORDPULL;
-extern short SWORDATTACK2;
-extern short MORNINGATTACK2;
-extern short MUMEDUSA;
-extern short MUTWOHANDS;
-extern short BMUTWOHANDS;
-extern short GOBSWORDPULL;
-extern short GOBSWORDATTACK;
-extern short GOBSWORDATTACK2;
-extern short BIGAXEATTACK;
-extern short BIGAXEATTACK2;
-extern short BIGAXEDRAW;
-extern short HALBERDATTACK1;
-extern short HALBERDATTACK2;
-extern short HALBERDDRAW;
-extern short PIKEDRAW;
-extern short PIKEATTACK1;
-extern short EXCALATTACK1;
-extern short EXCALATTACK2;
-extern short EXCALDRAW;
-extern short BIGAXEDRAW9;
-extern short BIGAXEDRAW10;
-extern short GEARS2START;
-extern short HORNEDSKULL;
-extern short THEFONT;
-extern short CRYSTALSTAFF;
-extern short TORCH;
-extern short WEAPON1;
-extern short WEAPON1A;
-extern short AMULETOFTHEMIST;
-extern short WEAPON2;
-extern short BRASSKEY;
-extern short BLACKKEY;
-extern short GLASSKEY;
-extern short IVORYKEY;
-extern short NEWCHUNK;
-extern short BOWLOFFIRE;
-extern short SPAWNFIREBALL;
-extern short PENTAGRAM;
-extern short THEHORN;
-extern short BOW;
-extern short SWINGGATE3;
-extern short PLATEARMOR;
-extern short HELMET;
-extern short CHAINMAIL;
-extern short SCROLLSCARE;
-extern short SCROLLNUKE;
-extern short SCROLLFLY;
-extern short SCROLLFIREBALL;
-extern short SCROLLFREEZE;
-extern short SCROLLNIGHT;
-extern short SCROLLMAGIC;
-extern short SCROLLOPEN;
-extern short LEATHERARMOR;
-extern short QUIVER;
-extern short SWINGGATE4;
-extern short SWINGGATE5;
-extern short SMOKEFX;
-extern short STANDINTORCH;
-extern short PENTADOOR3;
-extern short PENTADOOR4;
-extern short PENTADOOR5;
-extern short PENTADOOR6;
-extern short PENTADOOR7;
-extern short SCARY;
-extern short FISH;
-extern short LEVERUP;
-extern short LEVERDOWN;
-extern short SPAWNJAVLIN;
-extern short RAT;
-extern short GUARDIAN;
-extern short GUARDIANATTACK;
-extern short DART;
-extern short WEAPON4;
-extern short WEAPON6;
-extern short WEAPON5;
-extern short WEAPON5B;
-extern short THROWHALBERD;
-extern short WEAPON7;
-extern short THROWPIKE;
-extern short EXPLO2;
-extern short SHATTERVASE;
-extern short SHATTERVASE2;
-extern short SHATTERVASE3;
-extern short HANGMAN;
-extern short SKELETON;
-extern short SKELETONATTACK;
-extern short SKELETONSKULL;
-extern short SKELETONUP;
-extern short SKELETONDIE;
-extern short SKELETONDEAD;
-extern short BONECHUNK1;
-extern short BONECHUNKEND;
-extern short PIKEATTACK2;
-extern short GOBWEAPON;
-extern short SFLASKBLUE;
-extern short SFLASKGREEN;
-extern short SFLASKOCHRE;
-extern short SFLASKRED;
-extern short SFLASKTAN;
-extern short SFLASKBLACK;
-extern short SPOTIONBACKPIC;
-extern short SPOTIONARROW;
-extern short SSPELLBOOKBLANK;
-extern short SSPELLBOOK2;
-extern short SSPELLBOOK3;
-extern short SSPELLBOOK4;
-extern short SSPELLBOOK5;
-extern short SSPELLBOOK6;
-extern short SSPELLBOOK7;
-extern short SSPELLBOOK8;
-extern short SARROWS;
-extern short SPLAYERLVL;
-extern short SSTATUSBAR;
-extern short SKEYBLANK;
-extern short SKEYBRASS;
-extern short SKEYBLACK;
-extern short SKEYGLASS;
-extern short SKEYIVORY;
-extern short SHEALTHBACK;
-extern short SSCOREBACKPIC;
-extern short SNDEFFECT;
-extern short SNDLOOP;
-extern short SNDLOOPOFF;
-extern short BROWNCHUNKSTART;
-extern short GREYCHUNKSTART;
-extern short REDCHUNKSTART;
-extern short GREENCHUNKSTART;
-extern short TANCHUNKSTART;
-extern short WILLOW;
-extern short SPIKES;
-extern short STHEFLAG;
-extern short GRONHALATTACK;
-extern short GRONHALATTACKEND;
-extern short GROLHALREADY;
-extern short GRONHALREADYEND;
-extern short GRONHAL;
-extern short GRONHALPAIN;
-extern short GRONHALDIE;
-extern short GRONSWATTACK;
-extern short GRONSW;
-extern short GRONSWPAIN;
-extern short GRONSWDIE;
-extern short GRONMUATTACK;
-extern short GRONDIE;
-extern short GRONDEAD;
-extern short GRONMU;
-extern short GRONMUPAIN;
-extern short GRONMUDIE;
-extern short GRONSHIELD;
-extern short SHIELD;
+extern int KNIFEREADY;
+extern int KNIFEATTACK;
+extern int RFIST;
+extern int SWORDATTACK;
+extern int MORNINGSTAR;
+extern int BOWREADY;
+extern int BOWREADYEND;
+extern int BOWWALK;
+extern int KNIFEATTACK2;
+extern int SWORDPULL;
+extern int SWORDATTACK2;
+extern int MORNINGATTACK2;
+extern int MUMEDUSA;
+extern int MUTWOHANDS;
+extern int BMUTWOHANDS;
+extern int GOBSWORDPULL;
+extern int GOBSWORDATTACK;
+extern int GOBSWORDATTACK2;
+extern int BIGAXEATTACK;
+extern int BIGAXEATTACK2;
+extern int BIGAXEDRAW;
+extern int HALBERDATTACK1;
+extern int HALBERDATTACK2;
+extern int HALBERDDRAW;
+extern int PIKEDRAW;
+extern int PIKEATTACK1;
+extern int EXCALATTACK1;
+extern int EXCALATTACK2;
+extern int EXCALDRAW;
+extern int BIGAXEDRAW9;
+extern int BIGAXEDRAW10;
+extern int GEARS2START;
+extern int HORNEDSKULL;
+extern int THEFONT;
+extern int CRYSTALSTAFF;
+extern int TORCH;
+extern int WEAPON1;
+extern int WEAPON1A;
+extern int AMULETOFTHEMIST;
+extern int WEAPON2;
+extern int BRASSKEY;
+extern int BLACKKEY;
+extern int GLASSKEY;
+extern int IVORYKEY;
+extern int NEWCHUNK;
+extern int BOWLOFFIRE;
+extern int SPAWNFIREBALL;
+extern int PENTAGRAM;
+extern int THEHORN;
+extern int BOW;
+extern int SWINGGATE3;
+extern int PLATEARMOR;
+extern int HELMET;
+extern int CHAINMAIL;
+extern int SCROLLSCARE;
+extern int SCROLLNUKE;
+extern int SCROLLFLY;
+extern int SCROLLFIREBALL;
+extern int SCROLLFREEZE;
+extern int SCROLLNIGHT;
+extern int SCROLLMAGIC;
+extern int SCROLLOPEN;
+extern int LEATHERARMOR;
+extern int QUIVER;
+extern int SWINGGATE4;
+extern int SWINGGATE5;
+extern int SMOKEFX;
+extern int STANDINTORCH;
+extern int PENTADOOR3;
+extern int PENTADOOR4;
+extern int PENTADOOR5;
+extern int PENTADOOR6;
+extern int PENTADOOR7;
+extern int SCARY;
+extern int FISH;
+extern int LEVERUP;
+extern int LEVERDOWN;
+extern int SPAWNJAVLIN;
+extern int RAT;
+extern int GUARDIAN;
+extern int GUARDIANATTACK;
+extern int DART;
+extern int WEAPON4;
+extern int WEAPON6;
+extern int WEAPON5;
+extern int WEAPON5B;
+extern int THROWHALBERD;
+extern int WEAPON7;
+extern int THROWPIKE;
+extern int EXPLO2;
+extern int SHATTERVASE;
+extern int SHATTERVASE2;
+extern int SHATTERVASE3;
+extern int HANGMAN;
+extern int SKELETON;
+extern int SKELETONATTACK;
+extern int SKELETONSKULL;
+extern int SKELETONUP;
+extern int SKELETONDIE;
+extern int SKELETONDEAD;
+extern int BONECHUNK1;
+extern int BONECHUNKEND;
+extern int PIKEATTACK2;
+extern int GOBWEAPON;
+extern int SFLASKBLUE;
+extern int SFLASKGREEN;
+extern int SFLASKOCHRE;
+extern int SFLASKRED;
+extern int SFLASKTAN;
+extern int SFLASKBLACK;
+extern int SPOTIONBACKPIC;
+extern int SPOTIONARROW;
+extern int SSPELLBOOKBLANK;
+extern int SSPELLBOOK2;
+extern int SSPELLBOOK3;
+extern int SSPELLBOOK4;
+extern int SSPELLBOOK5;
+extern int SSPELLBOOK6;
+extern int SSPELLBOOK7;
+extern int SSPELLBOOK8;
+extern int SARROWS;
+extern int SPLAYERLVL;
+extern int SSTATUSBAR;
+extern int SKEYBLANK;
+extern int SKEYBRASS;
+extern int SKEYBLACK;
+extern int SKEYGLASS;
+extern int SKEYIVORY;
+extern int SHEALTHBACK;
+extern int SSCOREBACKPIC;
+extern int SNDEFFECT;
+extern int SNDLOOP;
+extern int SNDLOOPOFF;
+extern int BROWNCHUNKSTART;
+extern int GREYCHUNKSTART;
+extern int REDCHUNKSTART;
+extern int GREENCHUNKSTART;
+extern int TANCHUNKSTART;
+extern int WILLOW;
+extern int SPIKES;
+extern int STHEFLAG;
+extern int GRONHALATTACK;
+extern int GRONHALATTACKEND;
+extern int GROLHALREADY;
+extern int GRONHALREADYEND;
+extern int GRONHAL;
+extern int GRONHALPAIN;
+extern int GRONHALDIE;
+extern int GRONSWATTACK;
+extern int GRONSW;
+extern int GRONSWPAIN;
+extern int GRONSWDIE;
+extern int GRONMUATTACK;
+extern int GRONDIE;
+extern int GRONDEAD;
+extern int GRONMU;
+extern int GRONMUPAIN;
+extern int GRONMUDIE;
+extern int GRONSHIELD;
+extern int SHIELD;
 
 END_WH_NS