From 75fca769413e46462a498e27b7eb1c931af13e55 Mon Sep 17 00:00:00 2001 From: Alexander Monakov Date: Tue, 4 Jan 2011 00:20:15 +0300 Subject: [PATCH] Move dialogue stuff to Game.{cpp,h} --- Source/Constants.h | 2 -- Source/Game.cpp | 22 ++++++++++++++++++++++ Source/Game.h | 25 +++++++++++++++++++++++++ Source/GameDraw.cpp | 22 ---------------------- Source/GameTick.cpp | 22 ---------------------- Source/Globals.cpp | 22 ---------------------- 6 files changed, 47 insertions(+), 68 deletions(-) diff --git a/Source/Constants.h b/Source/Constants.h index 47c2304..1d8906f 100644 --- a/Source/Constants.h +++ b/Source/Constants.h @@ -42,6 +42,4 @@ static const char *editortypenames[] = { "dead1", "dead2", "dead3", "dead4" }; -const int max_dialogues = 20; -const int max_dialoguelength = 20; #endif diff --git a/Source/Game.cpp b/Source/Game.cpp index b3289e2..6592a31 100644 --- a/Source/Game.cpp +++ b/Source/Game.cpp @@ -4,6 +4,28 @@ extern int mainmenu; +int numdialogues; +int numdialogueboxes[max_dialogues]; +int dialoguetype[max_dialogues]; +int dialogueboxlocation[max_dialogues][max_dialoguelength]; +float dialogueboxcolor[max_dialogues][max_dialoguelength][3]; +int dialogueboxsound[max_dialogues][max_dialoguelength]; +char dialoguetext[max_dialogues][max_dialoguelength][128]; +char dialoguename[max_dialogues][max_dialoguelength][64]; +XYZ dialoguecamera[max_dialogues][max_dialoguelength]; +XYZ participantlocation[max_dialogues][10]; +int participantfocus[max_dialogues][max_dialoguelength]; +int participantaction[max_dialogues][max_dialoguelength]; +float participantrotation[max_dialogues][10]; +XYZ participantfacing[max_dialogues][max_dialoguelength][10]; +float dialoguecamerarotation[max_dialogues][max_dialoguelength]; +float dialoguecamerarotation2[max_dialogues][max_dialoguelength]; +int indialogue; +int whichdialogue; +int directing; +float dialoguetime; +int dialoguegonethrough[20]; + Game::Game() { terraintexture = 0; diff --git a/Source/Game.h b/Source/Game.h index d7714c3..867754d 100644 --- a/Source/Game.h +++ b/Source/Game.h @@ -320,4 +320,29 @@ extern "C" { void UndefinedSymbolToExposeStubbedCode(void); } //#define STUBBED(x) extern int numplayers; + +extern int numdialogues; +const int max_dialogues = 20; +const int max_dialoguelength = 20; +extern int numdialogueboxes[max_dialogues]; +extern int dialoguetype[max_dialogues]; +extern int dialogueboxlocation[max_dialogues][max_dialoguelength]; +extern float dialogueboxcolor[max_dialogues][max_dialoguelength][3]; +extern int dialogueboxsound[max_dialogues][max_dialoguelength]; +extern char dialoguetext[max_dialogues][max_dialoguelength][128]; +extern char dialoguename[max_dialogues][max_dialoguelength][64]; +extern XYZ dialoguecamera[max_dialogues][max_dialoguelength]; +extern XYZ participantlocation[max_dialogues][10]; +extern int participantfocus[max_dialogues][max_dialoguelength]; +extern int participantaction[max_dialogues][max_dialoguelength]; +extern float participantrotation[max_dialogues][10]; +extern XYZ participantfacing[max_dialogues][max_dialoguelength][10]; +extern float dialoguecamerarotation[max_dialogues][max_dialoguelength]; +extern float dialoguecamerarotation2[max_dialogues][max_dialoguelength]; +extern int indialogue; +extern int whichdialogue; +extern int directing; +extern float dialoguetime; +extern int dialoguegonethrough[20]; + #endif diff --git a/Source/GameDraw.cpp b/Source/GameDraw.cpp index 2b2c8b7..3d4b9f7 100644 --- a/Source/GameDraw.cpp +++ b/Source/GameDraw.cpp @@ -106,28 +106,6 @@ extern float menupulse; extern bool gamestart; -extern int numdialogues; -extern int numdialogueboxes[max_dialogues]; -extern int dialoguetype[max_dialogues]; -extern int dialogueboxlocation[max_dialogues][max_dialoguelength]; -extern float dialogueboxcolor[max_dialogues][max_dialoguelength][3]; -extern int dialogueboxsound[max_dialogues][max_dialoguelength]; -extern char dialoguetext[max_dialogues][max_dialoguelength][128]; -extern char dialoguename[max_dialogues][max_dialoguelength][64]; -extern XYZ dialoguecamera[max_dialogues][max_dialoguelength]; -extern XYZ participantlocation[max_dialogues][10]; -extern int participantfocus[max_dialogues][max_dialoguelength]; -extern int participantaction[max_dialogues][max_dialoguelength]; -extern float participantrotation[max_dialogues][10]; -extern XYZ participantfacing[max_dialogues][max_dialoguelength][10]; -extern float dialoguecamerarotation[max_dialogues][max_dialoguelength]; -extern float dialoguecamerarotation2[max_dialogues][max_dialoguelength]; -extern int indialogue; -extern int whichdialogue; -extern int directing; -extern float dialoguetime; -extern int dialoguegonethrough[20]; - extern bool gamestarted; extern bool showdamagebar; diff --git a/Source/GameTick.cpp b/Source/GameTick.cpp index d4b662d..383052e 100644 --- a/Source/GameTick.cpp +++ b/Source/GameTick.cpp @@ -157,28 +157,6 @@ extern int hostile; extern bool stillloading; extern bool winfreeze; -extern int numdialogues; -extern int numdialogueboxes[max_dialogues]; -extern int dialoguetype[max_dialogues]; -extern int dialogueboxlocation[max_dialogues][max_dialoguelength]; -extern float dialogueboxcolor[max_dialogues][max_dialoguelength][3]; -extern int dialogueboxsound[max_dialogues][max_dialoguelength]; -extern char dialoguetext[max_dialogues][max_dialoguelength][128]; -extern char dialoguename[max_dialogues][max_dialoguelength][64]; -extern XYZ dialoguecamera[max_dialogues][max_dialoguelength]; -extern XYZ participantlocation[max_dialogues][10]; -extern int participantfocus[max_dialogues][max_dialoguelength]; -extern int participantaction[max_dialogues][max_dialoguelength]; -extern float participantrotation[max_dialogues][10]; -extern XYZ participantfacing[max_dialogues][max_dialoguelength][10]; -extern float dialoguecamerarotation[max_dialogues][max_dialoguelength]; -extern float dialoguecamerarotation2[max_dialogues][max_dialoguelength]; -extern int indialogue; -extern int whichdialogue; -extern int directing; -extern float dialoguetime; -extern int dialoguegonethrough[20]; - extern bool campaign; extern float oldgamespeed; diff --git a/Source/Globals.cpp b/Source/Globals.cpp index 9efac83..40880f7 100644 --- a/Source/Globals.cpp +++ b/Source/Globals.cpp @@ -141,28 +141,6 @@ int killhotspot = 0; float menupulse = 0; -int numdialogues = 0; -int numdialogueboxes[max_dialogues] = {0}; -int dialoguetype[max_dialogues] = {0}; -int dialogueboxlocation[max_dialogues][max_dialoguelength] = {0}; -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]; //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}; -float dialoguecamerarotation[max_dialogues][max_dialoguelength] = {0}; -float dialoguecamerarotation2[max_dialogues][max_dialoguelength] = {0}; -int indialogue = 0; -int whichdialogue = 0; -int directing = 0; -float dialoguetime = 0; -int dialoguegonethrough[20] = {0}; - float smoketex = 0; float slomospeed = 0; -- 2.39.5