fd320767c5
The server's changes were easy. The clients means that the constructors for each scene have one less argument, and each scene has one less member. The exception to this is LobbyMenu, where the config is used in multiple places, so it was easier to have the config's reference as a member. To replace the config's usage, I added this line in most cases: ConfigUtility& config = ConfigUtility::GetSingleton(); The only requirement is that ConfigUtility::Create() and ConfigUtility::Delete() are called from the main() function.
51 lines
1.4 KiB
C++
51 lines
1.4 KiB
C++
/* Copyright: (c) Kayne Ruse 2013, 2014
|
|
*
|
|
* This software is provided 'as-is', without any express or implied
|
|
* warranty. In no event will the authors be held liable for any damages
|
|
* arising from the use of this software.
|
|
*
|
|
* Permission is granted to anyone to use this software for any purpose,
|
|
* including commercial applications, and to alter it and redistribute it
|
|
* freely, subject to the following restrictions:
|
|
*
|
|
* 1. The origin of this software must not be misrepresented; you must not
|
|
* claim that you wrote the original software. If you use this software
|
|
* in a product, an acknowledgment in the product documentation would be
|
|
* appreciated but is not required.
|
|
*
|
|
* 2. Altered source versions must be plainly marked as such, and must not be
|
|
* misrepresented as being the original software.
|
|
*
|
|
* 3. This notice may not be removed or altered from any source
|
|
* distribution.
|
|
*/
|
|
#include "server_application.hpp"
|
|
|
|
//singletons
|
|
#include "config_utility.hpp"
|
|
|
|
#include <stdexcept>
|
|
#include <iostream>
|
|
|
|
using namespace std;
|
|
|
|
int main(int argc, char** argv) {
|
|
try {
|
|
//create the singletons
|
|
ConfigUtility::Create();
|
|
|
|
//call the server's routines
|
|
ServerApplication app;
|
|
app.Init(argc, argv);
|
|
app.Proc();
|
|
app.Quit();
|
|
|
|
//delete the singletons
|
|
ConfigUtility::Delete();
|
|
}
|
|
catch(exception& e) {
|
|
cerr << "Fatal exception thrown: " << e.what() << endl;
|
|
return 1;
|
|
}
|
|
return 0;
|
|
} |