Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Mod] Super Cat Wars #198

Open
wants to merge 11 commits into
base: master
Choose a base branch
from
Open

[Mod] Super Cat Wars #198

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
1969ba8
Update main.cpp
AzureBerylBlue Dec 19, 2020
5d26bd0
Super Cat Wars Icons
AzureBerylBlue Dec 19, 2020
8ca5d46
Update leveleditor.cpp
AzureBerylBlue Dec 19, 2020
f124471
Update worldeditor.cpp
AzureBerylBlue Dec 19, 2020
9740e28
Update gamemodes.cpp
AzureBerylBlue Dec 19, 2020
eec2fcd
Update ModeOptionsMenu.cpp
AzureBerylBlue Dec 19, 2020
b466212
Update ProjectileLimitsMenu.cpp
AzureBerylBlue Dec 19, 2020
9fa3fe4
Update ProjectileOptionsMenu.cpp
AzureBerylBlue Dec 19, 2020
cf160af
Update leveleditor.cpp
AzureBerylBlue Jan 17, 2021
d18e519
Update PlayerAwardEffects.cpp
AzureBerylBlue Jan 23, 2022
22a118c
Update leveleditor.cpp
AzureBerylBlue Feb 4, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified resources/icons/smw-leveledit.ico
View file
Open in desktop
Binary file not shown.
Binary file modified resources/icons/smw-server.ico
View file
Open in desktop
Binary file not shown.
Binary file modified resources/icons/smw-worldedit.ico
View file
Open in desktop
Binary file not shown.
Binary file modified resources/icons/smw.ico
View file
Open in desktop
Binary file not shown.
6 changes: 3 additions & 3 deletions src/leveleditor/leveleditor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ void removeifprojectile(IO_MovingObject * object, bool playsound, bool forcedead
#endif


#define MAPTITLESTRING "SMW 2.0 Level Editor"
#define MAPTITLESTRING "Super Cat Wars Level Editor"


extern CMap* g_map;
Expand Down Expand Up @@ -2962,7 +2962,7 @@ SDL_Rect rBackground[2];
//SDL_Rect rTypeButton[8][4];
SDL_Rect rIconRects[MAXMAPHAZARDS][2];

const char * szHazardNames[8] = {"Fireballs", "Rotodisc", "Bullet Bill", "Flame Thrower", "Green Pirhana", "Red Pirhana", "Tall Pirhana", "Short Pirhana"};
const char * szHazardNames[8] = {"Firebar", "Electorb", "Cannonball", "Flamethrower", "Monkey", "Vulcan Turnip", "Bamboo Blossom", "Mr. Prickles"};

bool editor_maphazards_initialized = false;
void init_editor_maphazards()
Expand Down Expand Up @@ -3319,7 +3319,7 @@ int editor_maphazards()
rm->menu_font_small.draw(0, 480 - rm->menu_font_small.getHeight() * 2, "[esc] Exit, [l] Location, [+/-] Velocity, [LMB] Angle and Radius");

if (hazard->itype == 1)
rm->menu_font_small.draw(0, 480 - rm->menu_font_small.getHeight(), "[Shift + LMB] Snap To Angle, [1-9] Number of Rotodiscs");
rm->menu_font_small.draw(0, 480 - rm->menu_font_small.getHeight(), "[Shift + LMB] Snap To Angle, [1-9] Number of Electorbs");
else
rm->menu_font_small.draw(0, 480 - rm->menu_font_small.getHeight(), "[Shift + LMB] Snap To Angle");
} else if (hazard->itype == 2) {
Expand Down
20 changes: 10 additions & 10 deletions src/smw/gamemodes.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1057,7 +1057,7 @@ CGM_ShyGuyTag::CGM_ShyGuyTag() : CGameMode()
goal = 200;
gamemode = game_mode_shyguytag;

SetupModeStrings("Shyguy Tag", "Points", 50);
SetupModeStrings("Robo Tag", "Points", 50);
scorecounter = 0;
}

Expand Down Expand Up @@ -1181,7 +1181,7 @@ void CGM_ShyGuyTag::SetShyGuy(short iTeam)
if (list_players[iPlayer]->getTeamID() == iTeam) {
CPlayer * player = list_players[iPlayer];
player->shyguy = true;
eyecandy[2].add(new EC_GravText(&rm->game_font_large, player->centerX(), player->bottomY(), "Shyguy!", -VELJUMP*1.5));
eyecandy[2].add(new EC_GravText(&rm->game_font_large, player->centerX(), player->bottomY(), "Robo Tag!", -VELJUMP*1.5));
eyecandy[2].add(new EC_SingleAnimation(&rm->spr_fireballexplosion, player->centerX() - 16, player->centerY() - 16, 3, 8));

player->StripPowerups();
Expand Down Expand Up @@ -1316,7 +1316,7 @@ CGM_Eggs::CGM_Eggs() : CGameMode()
goal = 20;
gamemode = game_mode_eggs;

SetupModeStrings("Yoshi's Eggs", "Eggs", 5);
SetupModeStrings("Bells & Kittens", "Bells", 5);
};

void CGM_Eggs::init()
Expand Down Expand Up @@ -2171,7 +2171,7 @@ CGM_Star::CGM_Star() : CGM_TimeLimit()
{
goal = 5;
gamemode = game_mode_star;
SetupModeStrings("Star", "Lives", 1);
SetupModeStrings("Magic Bells", "Lives", 1);
iCurrentModeType = 0;
};

Expand Down Expand Up @@ -2460,9 +2460,9 @@ CPlayer * CGM_Star::swapplayer(short id, CPlayer * player)
starItem[id]->setPlayerColor(starPlayer[id]->getColorID());

if (starItem[id]->getType() == 1)
eyecandy[2].add(new EC_GravText(&rm->game_font_large, player->centerX(), player->bottomY(), iCurrentModeType == 2 ? "Star Get!" : "Shine Get!", -VELJUMP*1.5));
eyecandy[2].add(new EC_GravText(&rm->game_font_large, player->centerX(), player->bottomY(), iCurrentModeType == 2 ? "Bell Get!" : "Shiny!", -VELJUMP*1.5));
else
eyecandy[2].add(new EC_GravText(&rm->game_font_large, player->centerX(), player->bottomY(), "Ztarred!", -VELJUMP*1.5));
eyecandy[2].add(new EC_GravText(&rm->game_font_large, player->centerX(), player->bottomY(), "Corrupted!", -VELJUMP*1.5));

eyecandy[2].add(new EC_SingleAnimation(&rm->spr_fireballexplosion, player->centerX() - 16, player->centerY() - 16, 3, 8));
ifSoundOnPlay(rm->sfx_transform);
Expand Down Expand Up @@ -2958,7 +2958,7 @@ CGM_Chase::CGM_Chase() : CGameMode()
goal = 200;
gamemode = game_mode_chase;

SetupModeStrings("Phanto", "Points", 50);
SetupModeStrings("Ghost Chase", "Points", 50);
}

void CGM_Chase::init()
Expand Down Expand Up @@ -3121,11 +3121,11 @@ void CGM_Boss_MiniGame::draw_foreground()
rm->game_font_large.drawCentered(smw->ScreenWidth/2, 96, "You Failed To Defeat");

if (iBossType == 0)
rm->game_font_large.drawCentered(smw->ScreenWidth/2, 118, "The Mighty Sledge Brother");
rm->game_font_large.drawCentered(smw->ScreenWidth/2, 118, "The Boss");
else if (iBossType == 1)
rm->game_font_large.drawCentered(smw->ScreenWidth/2, 118, "The Mighty Bomb Brother");
rm->game_font_large.drawCentered(smw->ScreenWidth/2, 118, "The Boss");
else if (iBossType == 2)
rm->game_font_large.drawCentered(smw->ScreenWidth/2, 118, "The Mighty Flame Brother");
rm->game_font_large.drawCentered(smw->ScreenWidth/2, 118, "The Boss");
}
}
}
Expand Down
8 changes: 4 additions & 4 deletions src/smw/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
along with SMW. If not, see <http://www.gnu.org/licenses/>. */


#define TITLESTRING "Super Mario War"
#define TITLESTRING "Super Cat Wars"
#define VERSIONNUMBER "2.0"

#include "FileList.h"
Expand Down Expand Up @@ -281,7 +281,7 @@ int main(int argc, char *argv[])
create_globals();

printf("-------------------------------------------------------------------------------\n");
printf(" %s %s\n", TITLESTRING, VERSIONNUMBER);
printf(" %s\n", TITLESTRING);
printf("-------------------------------------------------------------------------------\n");
printf("\n---------------- startup ----------------\n");

Expand Down Expand Up @@ -309,8 +309,8 @@ int main(int argc, char *argv[])
//currently this only sets the title, not the icon.
//setting the icon isn't implemented in sdl -> i'll ask on the mailing list
char title[128];
sprintf(title, "%s %s", TITLESTRING, VERSIONNUMBER);
gfx_settitle(title);
//sprintf(title, "%s %s", TITLESTRING, VERSIONNUMBER);
gfx_settitle(TITLESTRING);
SDL_ShowCursor(SDL_DISABLE);

printf("\n---------------- loading ----------------\n");
Expand Down
16 changes: 8 additions & 8 deletions src/smw/menu/ModeOptionsMenu.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -403,7 +403,7 @@ UI_ModeOptionsMenu::UI_ModeOptionsMenu() : UI_Menu()

miEggModeLeftHeaderBar = new MI_Image(&rm->menu_plain_field, 0, 0, 0, 0, 320, 32, 1, 1, 0);
miEggModeRightHeaderBar = new MI_Image(&rm->menu_plain_field, 320, 0, 192, 0, 320, 32, 1, 1, 0);
miEggModeHeaderText = new MI_Text("Yoshi's Eggs Mode Menu", 320, 5, 0, 2, 1);
miEggModeHeaderText = new MI_Text("Bells & Kittens Mode Menu", 320, 5, 0, 2, 1);

mModeSettingsMenu[6].AddControl(miEggModeEggQuantityField[0], miEggModeBackButton, miEggModeEggQuantityField[1], NULL, miEggModeBackButton);
mModeSettingsMenu[6].AddControl(miEggModeEggQuantityField[1], miEggModeEggQuantityField[0], miEggModeEggQuantityField[2], NULL, miEggModeBackButton);
Expand Down Expand Up @@ -601,10 +601,10 @@ UI_ModeOptionsMenu::UI_ModeOptionsMenu() : UI_Menu()
miStarModeTimeField->SetData(&game_values.gamemodemenusettings.star.time, NULL, NULL);
miStarModeTimeField->SetKey(game_values.gamemodemenusettings.star.time);

miStarModeShineField = new MI_SelectField(&rm->spr_selectfield, 120, 220, "Star Type", 400, 150);
miStarModeShineField->Add("Ztar", 0, "", false, false);
miStarModeShineField->Add("Shine", 1, "", false, false);
miStarModeShineField->Add("Multi Star", 2, "", false, false);
miStarModeShineField = new MI_SelectField(&rm->spr_selectfield, 120, 220, "Bell Type", 400, 150);
miStarModeShineField->Add("Dark", 0, "", false, false);
miStarModeShineField->Add("Golden", 1, "", false, false);
miStarModeShineField->Add("Multi-Bell", 2, "", false, false);
miStarModeShineField->Add("Random", 3, "", false, false);
miStarModeShineField->SetData(&game_values.gamemodemenusettings.star.shine, NULL, NULL);
miStarModeShineField->SetKey(game_values.gamemodemenusettings.star.shine);
Expand Down Expand Up @@ -640,7 +640,7 @@ UI_ModeOptionsMenu::UI_ModeOptionsMenu() : UI_Menu()

miStarModeLeftHeaderBar = new MI_Image(&rm->menu_plain_field, 0, 0, 0, 0, 320, 32, 1, 1, 0);
miStarModeRightHeaderBar = new MI_Image(&rm->menu_plain_field, 320, 0, 192, 0, 320, 32, 1, 1, 0);
miStarModeHeaderText = new MI_Text("Star Mode Menu", 320, 5, 0, 2, 1);
miStarModeHeaderText = new MI_Text("Magic Bells Mode Menu", 320, 5, 0, 2, 1);

mModeSettingsMenu[10].AddControl(miStarModeTimeField, miStarModeBackButton, miStarModeShineField, NULL, miStarModeBackButton);
mModeSettingsMenu[10].AddControl(miStarModeShineField, miStarModeTimeField, miStarModePercentExtraTime, NULL, miStarModeBackButton);
Expand Down Expand Up @@ -1248,7 +1248,7 @@ UI_ModeOptionsMenu::UI_ModeOptionsMenu() : UI_Menu()

miChaseModeLeftHeaderBar = new MI_Image(&rm->menu_plain_field, 0, 0, 0, 0, 320, 32, 1, 1, 0);
miChaseModeRightHeaderBar = new MI_Image(&rm->menu_plain_field, 320, 0, 192, 0, 320, 32, 1, 1, 0);
miChaseModeHeaderText = new MI_Text("Phanto Mode Menu", 320, 5, 0, 2, 1);
miChaseModeHeaderText = new MI_Text("Ghost Chase Mode Menu", 320, 5, 0, 2, 1);

mModeSettingsMenu[20].AddControl(miChaseModeSpeedField, miChaseModeBackButton, miChaseModeQuantitySlider[0], NULL, miChaseModeBackButton);

Expand Down Expand Up @@ -1304,7 +1304,7 @@ UI_ModeOptionsMenu::UI_ModeOptionsMenu() : UI_Menu()

miShyGuyTagModeLeftHeaderBar = new MI_Image(&rm->menu_plain_field, 0, 0, 0, 0, 320, 32, 1, 1, 0);
miShyGuyTagModeRightHeaderBar = new MI_Image(&rm->menu_plain_field, 320, 0, 192, 0, 320, 32, 1, 1, 0);
miShyGuyTagModeHeaderText = new MI_Text("Shyguy Tag Mode Menu", 320, 5, 0, 2, 1);
miShyGuyTagModeHeaderText = new MI_Text("Robo Tag Mode Menu", 320, 5, 0, 2, 1);

mModeSettingsMenu[21].AddControl(miShyGuyTagModeTagOnSuicideField, miShyGuyTagModeBackButton, miShyGuyTagModeTagOnStompField, NULL, miShyGuyTagModeBackButton);
mModeSettingsMenu[21].AddControl(miShyGuyTagModeTagOnStompField, miShyGuyTagModeTagOnSuicideField, miShyGuyTagModeFreeTimeField, NULL, miShyGuyTagModeBackButton);
Expand Down
10 changes: 5 additions & 5 deletions src/smw/menu/options/ProjectileLimitsMenu.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ extern CGameValues game_values;

UI_ProjectileLimitsMenu::UI_ProjectileLimitsMenu() : UI_Menu()
{
miFireballLimitField = new MI_SelectField(&rm->spr_selectfield, 70, 60, "Fireball Limit", 500, 220);
miFireballLimitField = new MI_SelectField(&rm->spr_selectfield, 70, 60, "Chili Limit", 500, 220);
miFireballLimitField->Add("Unlimited", 0, "", false, false);
miFireballLimitField->Add("2", 2, "", false, false);
miFireballLimitField->Add("5", 5, "", false, false);
Expand Down Expand Up @@ -59,7 +59,7 @@ UI_ProjectileLimitsMenu::UI_ProjectileLimitsMenu() : UI_Menu()
miBoomerangLimitField->SetData(&game_values.boomeranglimit, NULL, NULL);
miBoomerangLimitField->SetKey(game_values.boomeranglimit);

miFeatherLimitField = new MI_SelectField(&rm->spr_selectfield, 70, 180, "Feather Limit", 500, 220);
miFeatherLimitField = new MI_SelectField(&rm->spr_selectfield, 70, 180, "Cloak Limit", 500, 220);
miFeatherLimitField->Add("Unlimited", 0, "", false, false);
miFeatherLimitField->Add("2", 2, "", false, false);
miFeatherLimitField->Add("5", 5, "", false, false);
Expand Down Expand Up @@ -91,7 +91,7 @@ UI_ProjectileLimitsMenu::UI_ProjectileLimitsMenu() : UI_Menu()
miLeafLimitField->SetData(&game_values.leaflimit, NULL, NULL);
miLeafLimitField->SetKey(game_values.leaflimit);

miPwingsLimitField = new MI_SelectField(&rm->spr_selectfield, 70, 260, "P-Wings Limit", 500, 220);
miPwingsLimitField = new MI_SelectField(&rm->spr_selectfield, 70, 260, "Balloon Limit", 500, 220);
miPwingsLimitField->Add("Unlimited", 0, "", false, false);
miPwingsLimitField->Add("2", 2, "", false, false);
miPwingsLimitField->Add("5", 5, "", false, false);
Expand All @@ -107,7 +107,7 @@ UI_ProjectileLimitsMenu::UI_ProjectileLimitsMenu() : UI_Menu()
miPwingsLimitField->SetData(&game_values.pwingslimit, NULL, NULL);
miPwingsLimitField->SetKey(game_values.pwingslimit);

miTanookiLimitField = new MI_SelectField(&rm->spr_selectfield, 70, 300, "Tanooki Limit", 500, 220);
miTanookiLimitField = new MI_SelectField(&rm->spr_selectfield, 70, 300, "Moon Crystal Limit", 500, 220);
miTanookiLimitField ->Add("Unlimited", 0, "", false, false);
miTanookiLimitField ->Add("2", 2, "", false, false);
miTanookiLimitField ->Add("5", 5, "", false, false);
Expand Down Expand Up @@ -139,7 +139,7 @@ UI_ProjectileLimitsMenu::UI_ProjectileLimitsMenu() : UI_Menu()
miBombLimitField ->SetData(&game_values.bombslimit, NULL, NULL);
miBombLimitField ->SetKey(game_values.bombslimit);

miWandLimitField = new MI_SelectField(&rm->spr_selectfield, 70, 380, "Wand Limit", 500, 220);
miWandLimitField = new MI_SelectField(&rm->spr_selectfield, 70, 380, "Freeze Pop Limit", 500, 220);
miWandLimitField ->Add("Unlimited", 0, "", false, false);
miWandLimitField ->Add("2", 2, "", false, false);
miWandLimitField ->Add("5", 5, "", false, false);
Expand Down
6 changes: 3 additions & 3 deletions src/smw/menu/options/ProjectileOptionsMenu.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,12 +192,12 @@ UI_ProjectileOptionsMenu::UI_ProjectileOptionsMenu() : UI_Menu()
miProjectileOptionsMenuRightHeaderBar = new MI_Image(&rm->menu_plain_field, 320, 0, 192, 0, 320, 32, 1, 1, 0);
miProjectileOptionsMenuHeaderText = new MI_Text("Projectile & Weapon Options Menu", 320, 5, 0, 2, 1);

miFireballText = new MI_Text("Fireball", 10, 50, 0, 2, 0);
miFeatherText = new MI_Text("Feather", 10, 120, 0, 2, 0);
miFireballText = new MI_Text("Chili Pepper", 10, 50, 0, 2, 0);
miFeatherText = new MI_Text("Olli's Cloak", 10, 120, 0, 2, 0);
miBoomerangText = new MI_Text("Boomerang", 10, 190, 0, 2, 0);
miHammerText = new MI_Text("Hammer", 325, 50, 0, 2, 0);
miShellText = new MI_Text("Shell", 10, 300, 0, 2, 0);
miWandText = new MI_Text("Wand", 10, 370, 0, 2, 0);
miWandText = new MI_Text("Freeze Pop", 10, 370, 0, 2, 0);
miBlueBlockText = new MI_Text("Throwable Blocks", 325, 200, 0, 2, 0);

AddControl(miFireballLifeField, miProjectileOptionsMenuBackButton, miFeatherJumpsField, NULL, miHammerLifeField);
Expand Down
22 changes: 11 additions & 11 deletions src/smw/player_components/PlayerAwardEffects.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,14 @@ struct STextAward {

#define PAWARD_LAST 9
const STextAward awardtexts[PAWARD_LAST] = {
STextAward("Double Kill", false),
STextAward("Triple Kill", false),
STextAward("Killing Spree", false),
STextAward("Killing Spree x 2", false),
STextAward("Killing Spree x 3", false),
STextAward("Dominating", true),
STextAward("Dominating x 2", true),
STextAward("Dominating x 3", true),
STextAward("Nice!", false),
STextAward("Cool!", false),
STextAward("Good!", false),
STextAward("Great!", false),
STextAward("Amazing!", false),
STextAward("Awesome!", true),
STextAward("Excellent!", true),
STextAward("Dominating!", true),
STextAward("Unstoppable!", true)
};

Expand Down Expand Up @@ -238,10 +238,10 @@ void PlayerAwardEffects::addKillerAward(CPlayer& killer, CPlayer* killed, killst
//if we stopped the other players run show another award
if (killed && killed->killsinrow >= 2) {
short a = (killed->killsinrow - 2) >= PAWARD_LAST ? PAWARD_LAST -1 : (killed->killsinrow - 2);
char text[128];
sprintf(text, "%s Stopped!", awardtexts[a].name);
//char text[128];
//sprintf(text, "%s Stopped!", awardtexts[a].name);

eyecandy[2].add(new EC_GravText(awardtexts[a].large ? &rm->game_font_large : &rm->game_font_small, killed->centerX(), killed->bottomY(), text, -VELJUMP*1.3f));
eyecandy[2].add(new EC_GravText(awardtexts[a].large ? &rm->game_font_large : &rm->game_font_small, killed->centerX(), killed->bottomY(), "Combo Broken!", -VELJUMP*1.3f));
}
}
}
Expand Down
28 changes: 14 additions & 14 deletions src/worldeditor/worldeditor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
#define SDL_Delay(n) ;
#endif

#define MAPTITLESTRING "SMW 2.0 World Editor"
#define MAPTITLESTRING "Super Cat Wars World Editor"

enum {EDITOR_EDIT, EDITOR_WATER, EDITOR_BACKGROUND, EDITOR_STAGEFOREGROUND, EDITOR_STRUCTUREFOREGROUND, EDITOR_BRIDGES, EDITOR_PATHSPRITE, EDITOR_VEHICLES, EDITOR_QUIT, SAVE_AS, FIND, CLEAR_WORLD, NEW_WORLD, RESIZE_WORLD, SAVE, EDITOR_WARP, DISPLAY_HELP, EDITOR_PATH, EDITOR_TYPE, EDITOR_BOUNDARY, EDITOR_START_ITEMS, EDITOR_STAGE};

Expand Down Expand Up @@ -603,11 +603,11 @@ int main(int argc, char *argv[])
SetStageMode(3, "Jail", "Kills", 5, 20);
SetStageMode(4, "Coin Collection", "Coins", 5, 20);
SetStageMode(5, "Stomp", "Kills", 10, 10);
SetStageMode(6, "Yoshi's Eggs", "Eggs", 5, 20);
SetStageMode(6, "Bells & Kittens", "Bells", 5, 20);
SetStageMode(7, "Capture The Flag", "Points", 5, 20);
SetStageMode(8, "Chicken", "Points", 50, 200);
SetStageMode(9, "Tag", "Points", 50, 200);
SetStageMode(10, "Star", "Lives", 1, 5);
SetStageMode(10, "Magic Bells", "Lives", 1, 5);
SetStageMode(11, "Domination", "Points", 50, 200);
SetStageMode(12, "King of the Hill", "Points", 50, 200);
SetStageMode(13, "Race", "Laps", 2, 10);
Expand All @@ -617,8 +617,8 @@ int main(int argc, char *argv[])
SetStageMode(17, "Greed", "Coins", 10, 40);
SetStageMode(18, "Health", "Lives", 1, 5);
SetStageMode(19, "Card Collection", "Points", 10, 30);
SetStageMode(20, "Phanto Chase", "Points", 50, 200);
SetStageMode(21, "Shy Guy Tag", "Points", 50, 200);
SetStageMode(20, "Ghost Chase", "Points", 50, 200);
SetStageMode(21, "Robo Tag", "Points", 50, 200);

//Setup The Mode Menu
mCurrentMenu = &mStageSettingsMenu;
Expand Down Expand Up @@ -818,15 +818,15 @@ int main(int argc, char *argv[])

//Create Vehicle Menu
miVehicleSpriteField = new MI_ImageSelectField(&rm->spr_selectfield, &spr_vehicleicons, 70, 80, "Sprite", 500, 150, 16, 16);
miVehicleSpriteField->Add("Hammer Brother", 0, "", false, false);
miVehicleSpriteField->Add("Boomerang Brother", 1, "", false, false);
miVehicleSpriteField->Add("Fire Brother", 2, "", false, false);
miVehicleSpriteField->Add("Tank 1", 3, "", false, false);
miVehicleSpriteField->Add("Boat 1", 4, "", false, false);
miVehicleSpriteField->Add("Boat 2", 5, "", false, false);
miVehicleSpriteField->Add("Airship 1", 6, "", false, false);
miVehicleSpriteField->Add("Airship 2", 7, "", false, false);
miVehicleSpriteField->Add("Tank 2", 8, "", false, false);
miVehicleSpriteField->Add("Commander Kobolt", 0, "", false, false);
miVehicleSpriteField->Add("Kallio", 1, "", false, false);
miVehicleSpriteField->Add("Mustamon", 2, "", false, false);
miVehicleSpriteField->Add("Tank", 3, "", false, false);
miVehicleSpriteField->Add("Boat", 4, "", false, false);
miVehicleSpriteField->Add("Commander Gorudo", 5, "", false, false);
miVehicleSpriteField->Add("Lord Iridium", 6, "", false, false);
miVehicleSpriteField->Add("Airship", 7, "", false, false);
miVehicleSpriteField->Add("Commander Mizu", 8, "", false, false);
miVehicleSpriteField->SetData(&g_wvVehicleStamp.iDrawSprite, NULL, NULL);
miVehicleSpriteField->SetKey(g_wvVehicleStamp.iDrawSprite);

Expand Down