mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-03-05 22:19:42 +00:00
Code Issues Releases Wiki Activity

[Client] Make Back button work in character generation

Browse source 
Character generation was coded in a strange way by Koncord in the earliest days of the project, but this fixes the main problem with it.
This commit is contained in:
David Cernat 2022-04-14 00:44:44 +03:00
parent e72bacbed3
commit 2898ad6e9a
2 changed files with 111 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

111
apps/openmw/mwgui/charactercreation.cpp
View file

@ -17,6 +17,17 @@
#include "../mwworld/esmstore.hpp"
#include "../mwworld/player.hpp"
/*
Start of tes3mp addition
Include additional headers for multiplayer purposes
*/
#include "../mwmp/Main.hpp"
#include "../mwmp/LocalPlayer.hpp"
/*
End of tes3mp addition
*/
#include "textinput.hpp"
#include "race.hpp"
#include "class.hpp"
@ -329,6 +340,16 @@ namespace MWGui
MWBase::Environment::get().getWindowManager()->popGuiMode();
MWBase::Environment::get().getWindowManager()->pushGuiMode(GM_Birth);
/*
Start of tes3mp addition
Decrease the character generation stage tracked for the LocalPlayer
*/
mwmp::Main::get().getLocalPlayer()->charGenState.currentStage--;
/*
End of tes3mp addition
*/
}
void CharacterCreation::onReviewActivateDialog(int parDialog)
@ -381,6 +402,16 @@ namespace MWGui
selectPickedClass();
handleDialogDone(CSE_ClassChosen, GM_Birth);
/*
Start of tes3mp addition
Increase the character generation stage tracked for the LocalPlayer
*/
mwmp::Main::get().getLocalPlayer()->charGenState.currentStage++;
/*
End of tes3mp addition
*/
}
void CharacterCreation::onPickClassDialogBack()
@ -411,6 +442,16 @@ namespace MWGui
break;
case ClassChoiceDialog::Class_Back:
MWBase::Environment::get().getWindowManager()->pushGuiMode(GM_Race);
/*
Start of tes3mp addition
Decrease the character generation stage tracked for the LocalPlayer
*/
mwmp::Main::get().getLocalPlayer()->charGenState.currentStage--;
/*
End of tes3mp addition
*/
break;
};
@ -439,6 +480,16 @@ namespace MWGui
}
handleDialogDone(CSE_NameChosen, GM_Race);
/*
Start of tes3mp addition
Increase the character generation stage tracked for the LocalPlayer
*/
mwmp::Main::get().getLocalPlayer()->charGenState.currentStage++;
/*
End of tes3mp addition
*/
}
void CharacterCreation::selectRace()
@ -477,6 +528,16 @@ namespace MWGui
selectRace();
handleDialogDone(CSE_RaceChosen, GM_Class);
/*
Start of tes3mp addition
Increase the character generation stage tracked for the LocalPlayer
*/
mwmp::Main::get().getLocalPlayer()->charGenState.currentStage++;
/*
End of tes3mp addition
*/
}
void CharacterCreation::selectBirthSign()
@ -498,6 +559,16 @@ namespace MWGui
selectBirthSign();
handleDialogDone(CSE_BirthSignChosen, GM_Review);
/*
Start of tes3mp addition
Increase the character generation stage tracked for the LocalPlayer
*/
mwmp::Main::get().getLocalPlayer()->charGenState.currentStage++;
/*
End of tes3mp addition
*/
}
void CharacterCreation::onBirthSignDialogBack()
@ -506,6 +577,16 @@ namespace MWGui
MWBase::Environment::get().getWindowManager()->popGuiMode();
MWBase::Environment::get().getWindowManager()->pushGuiMode(GM_Class);
/*
Start of tes3mp addition
Decrease the character generation stage tracked for the LocalPlayer
*/
mwmp::Main::get().getLocalPlayer()->charGenState.currentStage--;
/*
End of tes3mp addition
*/
}
void CharacterCreation::selectCreatedClass()
@ -547,6 +628,16 @@ namespace MWGui
selectCreatedClass();
handleDialogDone(CSE_ClassChosen, GM_Birth);
/*
Start of tes3mp addition
Increase the character generation stage tracked for the LocalPlayer
*/
mwmp::Main::get().getLocalPlayer()->charGenState.currentStage++;
/*
End of tes3mp addition
*/
}
void CharacterCreation::onCreateClassDialogBack()
@ -556,6 +647,16 @@ namespace MWGui
MWBase::Environment::get().getWindowManager()->popGuiMode();
MWBase::Environment::get().getWindowManager()->pushGuiMode(GM_Class);
/*
Start of tes3mp addition
Decrease the character generation stage tracked for the LocalPlayer
*/
mwmp::Main::get().getLocalPlayer()->charGenState.currentStage--;
/*
End of tes3mp addition
*/
}
void CharacterCreation::onClassQuestionChosen(int _index)
@ -748,6 +849,16 @@ namespace MWGui
selectGeneratedClass();
handleDialogDone(CSE_ClassChosen, GM_Birth);
/*
Start of tes3mp addition
Increase the character generation stage tracked for the LocalPlayer
*/
mwmp::Main::get().getLocalPlayer()->charGenState.currentStage++;
/*
End of tes3mp addition
*/
}
CharacterCreation::~CharacterCreation()

1
apps/openmw/mwmp/LocalPlayer.cpp
View file

@ -155,7 +155,6 @@ bool LocalPlayer::processCharGen()
}
getNetworking()->getPlayerPacket(ID_PLAYER_CHARGEN)->setPlayer(this);
getNetworking()->getPlayerPacket(ID_PLAYER_CHARGEN)->Send();
charGenState.currentStage++;
return false;
}