Commit 081d2441 authored by anotherguest's avatar anotherguest

Updates for Symbian main. Play at least ending scene since this looks nice.

parent 9a9d034d
...@@ -53,6 +53,9 @@ extern int volume; ...@@ -53,6 +53,9 @@ extern int volume;
extern int volume_direction; extern int volume_direction;
#endif #endif
#ifdef __SYMBIAN32__
extern char KOpenJazzPath[256];
#endif
int loadMain (int argc, char *argv[]) { int loadMain (int argc, char *argv[]) {
...@@ -77,6 +80,7 @@ int loadMain (int argc, char *argv[]) { ...@@ -77,6 +80,7 @@ int loadMain (int argc, char *argv[]) {
#else #else
firstPath = new Path(firstPath, createString("c:\\data\\openjazz\\")); firstPath = new Path(firstPath, createString("c:\\data\\openjazz\\"));
#endif #endif
firstPath = new Path(firstPath, createString(KOpenJazzPath));
#endif #endif
...@@ -662,9 +666,9 @@ int loop (int type) { ...@@ -662,9 +666,9 @@ int loop (int type) {
int main(int argc, char *argv[]) { int main(int argc, char *argv[]) {
/*
Scene *scene; Scene *scene = NULL;
*/ int scene_result = E_NONE;
// Initialise SDL // Initialise SDL
...@@ -704,11 +708,11 @@ int main(int argc, char *argv[]) { ...@@ -704,11 +708,11 @@ int main(int argc, char *argv[]) {
} }
if (scene->play() != E_QUIT) { scene_result = scene->play();
delete scene; delete scene;
*/ scene = NULL;*/
if (scene_result != E_QUIT) {
// Load the menu // Load the menu
try { try {
...@@ -728,7 +732,7 @@ int main(int argc, char *argv[]) { ...@@ -728,7 +732,7 @@ int main(int argc, char *argv[]) {
// Show the ending cutscene // Show the ending cutscene
/* try { try {
scene = new Scene(F_END_0SC); scene = new Scene(F_END_0SC);
...@@ -745,15 +749,13 @@ int main(int argc, char *argv[]) { ...@@ -745,15 +749,13 @@ int main(int argc, char *argv[]) {
scene->play(); scene->play();
delete scene; delete scene;
*/
} }
delete menu; delete menu;
/* }
} else delete scene;
*/
freeMain(); freeMain();
SDL_Quit(); SDL_Quit();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment