X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FGlobals.cpp;h=d44a3dff2348505fa97e978f72156fff75345e3c;hb=2adf4594e7eccc24647a6fce8ebf77da56c9c9d0;hp=6d8ed4f67132b0bc368b0eab4021c673cac5f3ae;hpb=36cc3af3e5074215817ddee16defde754e2ad67f;p=lugaru.git diff --git a/Source/Globals.cpp b/Source/Globals.cpp index 6d8ed4f..d44a3df 100644 --- a/Source/Globals.cpp +++ b/Source/Globals.cpp @@ -14,6 +14,10 @@ #include "Constants.h" +#if USE_SDL +#include "SDL.h" +#endif + bool visibleloading = 0; FSOUND_SAMPLE *samp[100] = {0}; FSOUND_STREAM * strm[20] = {0}; @@ -57,8 +61,12 @@ Sprites sprites; float sps = 0; #ifdef WIN32 HDC hDC; -#else +#elif USE_SDL +SDL_Surface *sdlscreen; +#elif PLATFORM_MACOSX AGLContext gaglContext; +#else +#error Define your platform. #endif int kTextureSize = 0; int detail = 0; @@ -136,12 +144,12 @@ float dialogueboxcolor[max_dialogues][max_dialoguelength][3] = {0}; int dialogueboxsound[max_dialogues][max_dialoguelength] = {0}; char dialoguetext[max_dialogues][max_dialoguelength][128] = {0}; char dialoguename[max_dialogues][max_dialoguelength][64] = {0}; -XYZ dialoguecamera[max_dialogues][max_dialoguelength] = {0}; -XYZ participantlocation[max_dialogues][10] = {0}; +XYZ dialoguecamera[max_dialogues][max_dialoguelength]; //l = {0}; +XYZ participantlocation[max_dialogues][10]; // = {0}; int participantfocus[max_dialogues][max_dialoguelength] = {0}; int participantaction[max_dialogues][max_dialoguelength] = {0}; float participantrotation[max_dialogues][10] = {0}; -XYZ participantfacing[max_dialogues][max_dialoguelength][10] = {0}; +XYZ participantfacing[max_dialogues][max_dialoguelength][10]; // = {0}; float dialoguecamerarotation[max_dialogues][max_dialoguelength] = {0}; float dialoguecamerarotation2[max_dialogues][max_dialoguelength] = {0}; int indialogue = 0; @@ -188,7 +196,7 @@ float bonusnum[100] = {0}; int hostile = 0; float hostiletime = 0; -XYZ envsound[30] = {0}; +XYZ envsound[30]; // = {0}; float envsoundvol[30] = {0}; float envsoundlife[30] = {0}; int numenvsounds;