From e88fd1dcef52d4375fef655918886fc14bb1f40c Mon Sep 17 00:00:00 2001
From: Treeki <treeki@gmail.com>
Date: Thu, 15 Mar 2012 02:54:33 +0100
Subject: optimisations to reduce code size

---
 src/worldmap.cpp | 32 --------------------------------
 1 file changed, 32 deletions(-)

(limited to 'src/worldmap.cpp')

diff --git a/src/worldmap.cpp b/src/worldmap.cpp
index d650fce..6413d00 100644
--- a/src/worldmap.cpp
+++ b/src/worldmap.cpp
@@ -7,12 +7,10 @@ dScNewerWorldMap_c *dScNewerWorldMap_c::instance = 0;
 
 dScNewerWorldMap_c *dScNewerWorldMap_c::build() {
 	// return new dScNewerWorldMap_c;
-	OSReport("Creating WorldMap\n");
 
 	void *buffer = AllocFromGameHeap1(sizeof(dScNewerWorldMap_c));
 	dScNewerWorldMap_c *c = new(buffer) dScNewerWorldMap_c;
 
-	OSReport("Created WorldMap @ %p\n", c);
 
 	instance = c;
 	return c;
@@ -237,32 +235,23 @@ void dScNewerWorldMap_c::GenText() {
 }
 
 int dScNewerWorldMap_c::onCreate() {
-	OSReport("1:Loading scene\n");
 
 	LoadMapScene();
-	OSReport("2:Loading scene\n");
 	GameSetup__LoadScene(0); // lol, stolen from GAME_SETUP
 
-	OSReport("3:Layout alloc\n");
 	this->layout = (Layout*)AllocFromGameHeap1(sizeof(Layout));
 	if (!this->layout) {
-		OSReport("memalloc fail\n");
 		InfiniteLoop;
 	}
 
-	OSReport("4:Layout ctor\n");
 	EmbeddedLayout_ctor(this->layout);
-	OSReport("5:Layout load arc\n");
 	EmbeddedLayout_LoadArc(this->layout, "NewerRes/wmap.arc");
 
-	OSReport("6:Layout build\n");
 	if (!EmbeddedLayout_Build(this->layout, "levelSelect.brlyt", 0)) {
-		OSReport("build fail\n");
 		InfiniteLoop;
 	}
 
 
-	OSReport("7:Layout load brlan\n");
 	const char *anims[2] = {anim1, anim2};
 	EmbeddedLayout_LoadBrlans(this->layout, anims, 2);
 
@@ -276,10 +265,8 @@ int dScNewerWorldMap_c::onCreate() {
 		};
 
 	int mappings[30] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1};
-	OSReport("8:Layout load group\n");
 	EmbeddedLayout_LoadGroups(this->layout, groups, mappings, 30);
 
-	OSReport("9:Layout reset anims\n");
 	EmbeddedLayout_DisableAllAnims(this->layout);
 
 	for (int i = 0; i < 15; i++) {
@@ -287,17 +274,12 @@ int dScNewerWorldMap_c::onCreate() {
 	}
 
 
-	OSReport("10:Item 1\n");
 	this->selectCursor = CreateParentedObject(SELECT_CURSOR, this, 0, 0);
-	OSReport("11:Item 2\n");
 	this->csMenu = CreateParentedObject(COURSE_SELECT_MENU, this, 0, 0);
-	OSReport("12:Item 3\n");
 	this->yesNoWindow = CreateParentedObject(YES_NO_WINDOW, this, 0, 0);
-	OSReport("13:Item 4\n");
 	this->numPeopleChange = CreateParentedObject(NUMBER_OF_PEOPLE_CHANGE, this, 0, 0);
 
 	for (int i = 0; i < 4; i++) {
-		OSReport("14:Character change select %d\n", i);
 		void *ccsb = CreateParentedObject(CHARACTER_CHANGE_SELECT_BASE, this, i, 0);
 		void *ccsc = CreateParentedObject(CHARACTER_CHANGE_SELECT_CONTENTS, this, i, 0);
 		void *ccsa = CreateParentedObject(CHARACTER_CHANGE_SELECT_ARROW, this, i, 0);
@@ -309,16 +291,12 @@ int dScNewerWorldMap_c::onCreate() {
 		NPCHG_CCI(this->numPeopleChange, i) = cci;
 	}
 
-	OSReport("15:Item 5\n");
 	this->continueObj = CreateParentedObject(CONTINUE, this, 0, 0);
 
-	OSReport("16:Item 6\n");
 	this->stockItem = CreateParentedObject(STOCK_ITEM, this, 0, 0);
-	OSReport("17:Item 7\n");
 	this->stockItemShadow = CreateParentedObject(STOCK_ITEM_SHADOW, this, 0, 0);
 	STKI_SHADOW(this->stockItem) = this->stockItemShadow;
 
-	OSReport("18:Item 8\n");
 	this->easyPairing = CreateParentedObject(EASY_PAIRING, this, 0, 0);
 
 	this->state = STATE_START_DVD;
@@ -328,13 +306,10 @@ int dScNewerWorldMap_c::onCreate() {
 	*CurrentDrawFunc = NewerMapDrawFunc;
 
 	// level info
-	OSReport("19:Load level info\n");
 	this->levelInfo = LoadFile(&this->levelInfoFH, "/NewerRes/LevelInfo.bin");
-	OSReport("20:Prepare level info\n");
 	LevelInfo_Prepare(&this->levelInfoFH);
 
 	// load the menu info
-	OSReport("21:Load save info\n");
 	SaveBlock *save = GetSaveFile()->GetBlock(-1);
 
 	this->currentPage = save->current_world;
@@ -353,14 +328,11 @@ int dScNewerWorldMap_c::onCreate() {
 	this->selections[this->currentPage] = save->current_path_node;
 
 	// show button anim
-	OSReport("22:Enable anim\n");
 	EmbeddedLayout_EnableNonLoopAnim(this->layout, save->current_path_node, false);
 
-	OSReport("23:Make text\n");
 	this->GenText();
 	this->GenSBTitle();
 
-	OSReport("24:onCreate complete\n");
 	return true;
 }
 
@@ -606,13 +578,11 @@ int dScNewerWorldMap_c::onExecute() {
 					switch (CSMENU_CURRENT(this->csMenu)) {
 						case 0:
 							// Star Coins
-							//OSReport("Star Coins was pressed\n");
 							this->state = STATE_NORMAL;
 							break;
 
 						case 1:
 							// Add/Drop Players
-							//OSReport("Add/Drop Players was pressed\n");
 							this->state = STATE_PLAYER_CHANGE_WAIT;
 							NPCHG_ACTIVE(this->numPeopleChange) = true;
 							WpadShit(10);
@@ -621,7 +591,6 @@ int dScNewerWorldMap_c::onExecute() {
 
 						case 2:
 							// Save or Quick Save
-							//OSReport("Save or Quick Save was pressed\n");
 							if (GetSaveFile()->GetBlock(-1)->bitfield & 2) {
 								this->state = STATE_SAVE_OPEN;
 								YESNO_TYPE(this->yesNoWindow) = 1;
@@ -638,7 +607,6 @@ int dScNewerWorldMap_c::onExecute() {
 
 						case 3:
 							// Title Screen
-							//OSReport("Title Screen was pressed\n");
 							this->state = STATE_TITLE_CONFIRM_OPEN_WAIT;
 							YESNO_VISIBLE(this->yesNoWindow) = true;
 							YESNO_TYPE(this->yesNoWindow) = 10;
-- 
cgit v1.2.3