WMResourceMng now works! also, a bit more cleanup

1 files changed, 15 insertions, 15 deletions

diff --git a/src/worldmap.cpp b/src/worldmap.cpp
index 45d3d24..62f3de2 100644
--- a/src/worldmap.cpp
+++ b/src/worldmap.cpp
@@ -7,12 +7,12 @@ dScNewerWorldMap_c *dScNewerWorldMap_c::instance = 0;
 

 dScNewerWorldMap_c *dScNewerWorldMap_c::build() {

 	// return new dScNewerWorldMap_c;

-	OSReport("Creating WorldMap\n");

+	MapReport("Creating WorldMap\n");

 

 	void *buffer = AllocFromGameHeap1(sizeof(dScNewerWorldMap_c));

 	dScNewerWorldMap_c *c = new(buffer) dScNewerWorldMap_c;

 

-	OSReport("Created WorldMap @ %p\n", c);

+	MapReport("Created WorldMap @ %p\n", c);

 

 	instance = c;

 	return c;

@@ -361,13 +361,13 @@ int dScNewerWorldMap_c::onExecute() {
 					switch (CSMENU_CURRENT(this->csMenu)) {

 						case 0:

 							// Star Coins

-							//OSReport("Star Coins was pressed\n");

+							MapReport("Star Coins was pressed\n");

 							this->state = STATE_NORMAL;

 							break;

 

 						case 1:

 							// Add/Drop Players

-							//OSReport("Add/Drop Players was pressed\n");

+							MapReport("Add/Drop Players was pressed\n");

 							this->state = STATE_PLAYER_CHANGE_WAIT;

 							NPCHG_ACTIVE(this->numPeopleChange) = true;

 							WpadShit(10);

@@ -376,7 +376,7 @@ int dScNewerWorldMap_c::onExecute() {
 

 						case 2:

 							// Save or Quick Save

-							//OSReport("Save or Quick Save was pressed\n");

+							MapReport("Save or Quick Save was pressed\n");

 							if (GetSaveFile()->GetBlock(-1)->bitfield & 2) {

 								this->state = STATE_SAVE_OPEN;

 								YESNO_TYPE(this->yesNoWindow) = 1;

@@ -393,7 +393,7 @@ int dScNewerWorldMap_c::onExecute() {
 

 						case 3:

 							// Title Screen

-							//OSReport("Title Screen was pressed\n");

+							MapReport("Title Screen was pressed\n");

 							this->state = STATE_TITLE_CONFIRM_OPEN_WAIT;

 							YESNO_VISIBLE(this->yesNoWindow) = true;

 							YESNO_TYPE(this->yesNoWindow) = 10;

@@ -744,32 +744,32 @@ int dScNewerWorldMap_c::onDraw() {
 

 

 

-// Todo: move to .LZ files and dDvd::loader_c

+// Todo: move to .LZ files and dDvd::loader_c and WM_MAP

 

 void dScNewerWorldMap_c::LoadModel() {

-	OSReport("Loading Goldwood model...\n");

-	modelFile.openCompressed("/NewerRes/Maps/SMGoldwood.brres");

+	MapReport("Loading Goldwood model...\n");

+	modelFile.openCompressed("/Maps/SMGoldwood_bLZ.brres");

 

 	nw4r::g3d::ResFile resfile(modelFile.ptr());

 

 	if (!resfile.CheckRevision())

-		OSReport("Warning: Revision check failed!\n");

+		MapReport("Warning: Revision check failed!\n");

 

 	resfile.Init();

 

 	if (!resfile.Bind(resfile))

-		OSReport("Warning: ResFile bind failed!\n");

+		MapReport("Warning: ResFile bind failed!\n");

 

 	void *mdl = resfile.GetResMdl("GoldwoodBase");

-	OSReport("Obtained ResMdl: %p\n", mdl);

+	MapReport("Obtained ResMdl: %p\n", mdl);

 

-	OSReport(this->allocator.link(-1, GameHeaps[0], 0, 0x20) ? "Success\n" : "Fail\n");

-	OSReport(this->model.setup(&mdl, &this->allocator, 0, 1, 0) ? "Success\n" : "Fail\n");

+	MapReport(this->allocator.link(-1, GameHeaps[0], 0, 0x20) ? "Success\n" : "Fail\n");

+	MapReport(this->model.setup(&mdl, &this->allocator, 0, 1, 0) ? "Success\n" : "Fail\n");

 

 	SetupTextures_Map(&model, 1);

 

 	this->allocator.unlink();

-	OSReport("Done loading model!\n");

+	MapReport("Done loading model!\n");

 

 	Mtx asdf;

 	MTXIdentity(asdf);