Can move between rooms and stuff

Author: pmprog

Game/Entities/combatant.cpp

@@ -17,7 +17,10 @@ Combatant::Combatant(Controller* Controls)
 	CurrentState = CombatantState::STANDING;
 	CurrentStateTime = 0;
 
-	world_z = 0;
+	CurrentRoomID = 0;
+
+	CollectedMagic = 0;
+	CollectedMagicRemaining = 0;
 
   weapon_change_on_stand = false;
   weapon_current_index = 0;
@@ -35,6 +38,7 @@ Combatant::Combatant(Controller* Controls)
 
 	CurrentPower = COMBATANT_POWER;
 	world_zone = nullptr;
+	world_z = 0;
 
 	ZoneClipping = false;
 	UnlimitedPower = false;
@@ -507,7 +511,7 @@ void Combatant::ProposeMove( int ScreenX, int ScreenY )
         this->ScreenY = z->TransportScreenY;
         if( z->TransportFacing != GameDirection::UNCHANGED )
         {
-          CurrentDirection == z->TransportFacing;
+          CurrentDirection = z->TransportFacing;
         }
         if( z->TransportClearInput )
         {

Game/Entities/world.cpp

@@ -58,9 +58,14 @@ World::~World()
 void World::Save()
 {
 	int roomid;
+	std::string query;
 
 	gamedb->ExecuteStatement("DELETE FROM `World` WHERE GameID = " + Strings::FromNumber( gameid ) + ";");
-	gamedb->ExecuteStatement("INSERT INTO `World` ( GameID, GameName, OnUpdate ) SELECT " + Strings::FromNumber( gameid ) + ", 'JANE v4', '" + Strings::Replace( Script_OnUpdate, "'", "''" ) + "';");
+
+	query = "INSERT INTO `World` ( GameID, GameName, OnUpdate, Start_RoomID, Start_ScreenX, Start_ScreenY, Start_Facing ) ";
+	query += "SELECT " + Strings::FromNumber( gameid ) + ", 'JANE v4', '" + Strings::Replace( Script_OnUpdate, "'", "''" ) + "', ";
+	query += Strings::FromNumber( Start_RoomID ) + ", " + Strings::FromNumber( Start_ScreenX ) + ", " + Strings::FromNumber( Start_ScreenY ) + ", " + Strings::FromNumber( Start_Facing ) + ";";
+	gamedb->ExecuteStatement( query );
 
   roomid = 0;
   for( std::vector<Room*>::const_iterator roomptr = Rooms.begin(); roomptr != Rooms.end(); roomptr++ )

Game/debugstage.cpp

@@ -18,6 +18,8 @@ void DebugStage::Begin()
   curroom = 0;
 	GameResources::GameWorld->Rooms.at( curroom )->OnEnter();
 
+	textfont = al_load_ttf_font( "resources/silkscreen.ttf", 8, ALLEGRO_TTF_MONOCHROME );
+
 	AUDIO->PlayMusic( "resources/Paul Hannay (Feekzoid) - Last_Ninja_4_loader [1].ogg", true );
 }
 
@@ -33,7 +35,7 @@ void DebugStage::Finish()
 {
 	delete ninja->Controls;
 	delete ninja;
-	FRAMEWORK->SetSlowMode( false );
+	al_destroy_font( textfont );
 }
 
 void DebugStage::EventOccurred(Event *e)
@@ -76,6 +78,9 @@ void DebugStage::Render()
 	GameResources::GameWorld->Rooms.at( curroom )->Render( ninja->ScreenY, 200 );
 
 	GameResources::GameOverlay->Draw( 0, 0, 0 );
+
+	al_draw_textf( textfont, Palette::ColourPalette[7], 6, 150, ALLEGRO_ALIGN_LEFT, "Ninja: %d, %d", ninja->ScreenX, ninja->ScreenY );
+
 }
 
 bool DebugStage::IsTransition()

Game/debugstage.h

@@ -11,6 +11,7 @@ class DebugStage : public Stage
 	private:
 		Combatant* ninja;
 		int curroom;
+		ALLEGRO_FONT* textfont;
 
   public:
     // Stage control

Game/gamestage.cpp

@@ -55,7 +55,11 @@ void GameStage::EventOccurred(Event *e)
 void GameStage::Update()
 {
   GameResources::GameWorld->Rooms.at( curroom )->Update();
-	ninja->OnUpdate();
+
+	if( GameResources::GameWorld->Rooms.at( curroom )->FullyRendered )
+	{
+		ninja->OnUpdate();
+	}
 
 	if( ninja->CurrentRoomID != curroom )
   {
@@ -69,9 +73,15 @@ void GameStage::Update()
 void GameStage::Render()
 {
 	al_clear_to_color( Palette::ColourPalette[ GameResources::GameWorld->Rooms.at( curroom )->BackgroundColour ] );
-	GameResources::GameWorld->Rooms.at( curroom )->Render( 0, ninja->ScreenY );
-	ninja->OnRender();
-	GameResources::GameWorld->Rooms.at( curroom )->Render( ninja->ScreenY, 200 );
+
+	if( GameResources::GameWorld->Rooms.at( curroom )->FullyRendered )
+	{
+		GameResources::GameWorld->Rooms.at( curroom )->Render( 0, ninja->ScreenY );
+		ninja->OnRender();
+		GameResources::GameWorld->Rooms.at( curroom )->Render( ninja->ScreenY, 200 );
+	} else {
+		GameResources::GameWorld->Rooms.at( curroom )->Render( 0, 200 );
+	}
 
 	GameResources::GameOverlay->Draw( 0, 0, 0 );