[Scummvm-cvs-logs] SF.net SVN: scummvm: [20851] scummvm/trunk/engines/cine
fingolfin at users.sourceforge.net
fingolfin at users.sourceforge.net
Fri Feb 24 16:27:11 CET 2006
Revision: 20851
Author: fingolfin
Date: 2006-02-24 16:26:14 -0800 (Fri, 24 Feb 2006)
ViewCVS: http://svn.sourceforge.net/scummvm?rev=20851&view=rev
Log Message:
-----------
Moved cine engine into namespace Cine
Modified Paths:
--------------
scummvm/trunk/engines/cine/anim.cpp
scummvm/trunk/engines/cine/anim.h
scummvm/trunk/engines/cine/auto00.cpp
scummvm/trunk/engines/cine/auto00.h
scummvm/trunk/engines/cine/bg.cpp
scummvm/trunk/engines/cine/bg.h
scummvm/trunk/engines/cine/bg_list.cpp
scummvm/trunk/engines/cine/bg_list.h
scummvm/trunk/engines/cine/cine.cpp
scummvm/trunk/engines/cine/cine.h
scummvm/trunk/engines/cine/flip_support.cpp
scummvm/trunk/engines/cine/flip_support.h
scummvm/trunk/engines/cine/font.cpp
scummvm/trunk/engines/cine/font.h
scummvm/trunk/engines/cine/gfx.cpp
scummvm/trunk/engines/cine/gfx.h
scummvm/trunk/engines/cine/main_loop.cpp
scummvm/trunk/engines/cine/main_loop.h
scummvm/trunk/engines/cine/msg.cpp
scummvm/trunk/engines/cine/msg.h
scummvm/trunk/engines/cine/object.cpp
scummvm/trunk/engines/cine/object.h
scummvm/trunk/engines/cine/pal.cpp
scummvm/trunk/engines/cine/pal.h
scummvm/trunk/engines/cine/part.cpp
scummvm/trunk/engines/cine/part.h
scummvm/trunk/engines/cine/prc.cpp
scummvm/trunk/engines/cine/prc.h
scummvm/trunk/engines/cine/rel.cpp
scummvm/trunk/engines/cine/rel.h
scummvm/trunk/engines/cine/resource.cpp
scummvm/trunk/engines/cine/resource.h
scummvm/trunk/engines/cine/script.cpp
scummvm/trunk/engines/cine/script.h
scummvm/trunk/engines/cine/sfx_player.cpp
scummvm/trunk/engines/cine/sfx_player.h
scummvm/trunk/engines/cine/sound_driver.cpp
scummvm/trunk/engines/cine/sound_driver.h
scummvm/trunk/engines/cine/texte.cpp
scummvm/trunk/engines/cine/texte.h
scummvm/trunk/engines/cine/unpack.cpp
scummvm/trunk/engines/cine/unpack.h
scummvm/trunk/engines/cine/various.cpp
scummvm/trunk/engines/cine/various.h
Modified: scummvm/trunk/engines/cine/anim.cpp
===================================================================
--- scummvm/trunk/engines/cine/anim.cpp 2006-02-24 23:49:57 UTC (rev 20850)
+++ scummvm/trunk/engines/cine/anim.cpp 2006-02-25 00:26:14 UTC (rev 20851)
@@ -24,6 +24,8 @@
#include "cine/cine.h"
+namespace Cine {
+
struct animHeader2Struct {
uint32 field_0;
uint16 width;
@@ -973,3 +975,5 @@
loadPart(part);
}
+
+} // End of namespace Cine
Modified: scummvm/trunk/engines/cine/anim.h
===================================================================
--- scummvm/trunk/engines/cine/anim.h 2006-02-24 23:49:57 UTC (rev 20850)
+++ scummvm/trunk/engines/cine/anim.h 2006-02-25 00:26:14 UTC (rev 20851)
@@ -25,6 +25,8 @@
#ifndef CINE_ANIM_H_
#define CINE_ANIM_H_
+namespace Cine {
+
extern uint16 frameVar0;
struct animHeaderStruct {
@@ -63,4 +65,6 @@
void loadAbs(char *resourceName, uint16 idx);
void loadResourcesFromSave();
+} // End of namespace Cine
+
#endif
Modified: scummvm/trunk/engines/cine/auto00.cpp
===================================================================
--- scummvm/trunk/engines/cine/auto00.cpp 2006-02-24 23:49:57 UTC (rev 20850)
+++ scummvm/trunk/engines/cine/auto00.cpp 2006-02-25 00:26:14 UTC (rev 20851)
@@ -22,6 +22,8 @@
*
*/
+namespace Cine {
+
unsigned char AUT000[] = {
0x00, 0x32, 0x00, 0x00, 0x00, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -36,3 +38,5 @@
0x41, 0x54, 0x00, 0x3d, 0x43, 0x49, 0x4e, 0x45, 0x4d, 0x41, 0x2e, 0x50, 0x49, 0x31, 0x00, 0x47,
0x46, 0x6f, 0x43, 0x51, 0x00, 0x1e, 0x1e, 0x43, 0x51, 0x00,
};
+
+} // End of namespace Cine
Modified: scummvm/trunk/engines/cine/auto00.h
===================================================================
--- scummvm/trunk/engines/cine/auto00.h 2006-02-24 23:49:57 UTC (rev 20850)
+++ scummvm/trunk/engines/cine/auto00.h 2006-02-25 00:26:14 UTC (rev 20851)
@@ -25,8 +25,12 @@
#ifndef CINE_AUTO00_H_
#define CINE_AUTO00_H_
+namespace Cine {
+
extern unsigned char AUT000[];
#define AUT000_size sizeof(AUT000);
+} // End of namespace Cine
+
#endif
Modified: scummvm/trunk/engines/cine/bg.cpp
===================================================================
--- scummvm/trunk/engines/cine/bg.cpp 2006-02-24 23:49:57 UTC (rev 20850)
+++ scummvm/trunk/engines/cine/bg.cpp 2006-02-25 00:26:14 UTC (rev 20851)
@@ -24,6 +24,8 @@
#include "cine/cine.h"
+namespace Cine {
+
uint16 bgVar0;
void loadCtHigh(uint8 * currentPtr) {
@@ -147,3 +149,5 @@
gfxConvertSpriteToRaw(additionalBgTable[bgIdx], ptr + 0x22, 160, 200);
}
+
+} // End of namespace Cine
Modified: scummvm/trunk/engines/cine/bg.h
===================================================================
--- scummvm/trunk/engines/cine/bg.h 2006-02-24 23:49:57 UTC (rev 20850)
+++ scummvm/trunk/engines/cine/bg.h 2006-02-25 00:26:14 UTC (rev 20851)
@@ -25,6 +25,8 @@
#ifndef CINE_BG_H_
#define CINE_BG_H_
+namespace Cine {
+
uint8 loadBg(const char *bgName);
uint8 loadCt(const char *bgName);
@@ -36,4 +38,6 @@
extern uint16 bgVar0;
+} // End of namespace Cine
+
#endif
Modified: scummvm/trunk/engines/cine/bg_list.cpp
===================================================================
--- scummvm/trunk/engines/cine/bg_list.cpp 2006-02-24 23:49:57 UTC (rev 20850)
+++ scummvm/trunk/engines/cine/bg_list.cpp 2006-02-25 00:26:14 UTC (rev 20851)
@@ -24,6 +24,8 @@
#include "cine/cine.h"
+namespace Cine {
+
void createVar9Element(int16 objIdx, int16 param);
void addSpriteFilledToBGList(int16 idx) {
@@ -44,3 +46,5 @@
createVar9Element(idx, 1);
}
+
+} // End of namespace Cine
Modified: scummvm/trunk/engines/cine/bg_list.h
===================================================================
--- scummvm/trunk/engines/cine/bg_list.h 2006-02-24 23:49:57 UTC (rev 20850)
+++ scummvm/trunk/engines/cine/bg_list.h 2006-02-25 00:26:14 UTC (rev 20851)
@@ -25,6 +25,10 @@
#ifndef CINE_BGLIST_H_
#define CINE_BGLIST_H_
+namespace Cine {
+
void addSpriteFilledToBGList(int16 idx);
+} // End of namespace Cine
+
#endif
Modified: scummvm/trunk/engines/cine/cine.cpp
===================================================================
--- scummvm/trunk/engines/cine/cine.cpp 2006-02-24 23:49:57 UTC (rev 20850)
+++ scummvm/trunk/engines/cine/cine.cpp 2006-02-25 00:26:14 UTC (rev 20851)
@@ -38,6 +38,9 @@
#include "cine/cine.h"
#include "cine/sound_driver.h"
+
+namespace Cine {
+
Audio::Mixer * cine_g_mixer;
AdlibMusic *g_cine_adlib;
@@ -45,6 +48,10 @@
char *savePath;
+} // End of namespace Cine
+
+
+
struct CINEGameSettings {
const char *name;
const char *description;
@@ -179,7 +186,6 @@
return 0;
}
- }
int gameType;
@@ -253,3 +259,5 @@
processPendingUpdates(0);
}
+
+} // End of namespace Cine
Modified: scummvm/trunk/engines/cine/cine.h
===================================================================
--- scummvm/trunk/engines/cine/cine.h 2006-02-24 23:49:57 UTC (rev 20850)
+++ scummvm/trunk/engines/cine/cine.h 2006-02-25 00:26:14 UTC (rev 20851)
@@ -35,6 +35,28 @@
#include "base/engine.h"
#include "base/gameDetector.h"
+#include "cine/font.h"
+#include "cine/various.h"
+#include "cine/flip_support.h"
+#include "cine/texte.h"
+#include "cine/object.h"
+#include "cine/rel.h"
+#include "cine/script.h"
+#include "cine/part.h"
+#include "cine/prc.h"
+#include "cine/main_loop.h"
+#include "cine/resource.h"
+#include "cine/msg.h"
+#include "cine/bg.h"
+#include "cine/pal.h"
+#include "cine/gfx.h"
+#include "cine/anim.h"
+#include "cine/auto00.h"
+#include "cine/unpack.h"
+#include "cine/bg_list.h"
+#include "cine/sfx_player.h"
+#include "cine/sound_driver.h"
+
namespace Cine {
enum CineGameId {
@@ -42,7 +64,7 @@
GID_OS
};
-class CineEngine : public ::Engine {
+class CineEngine : public Engine {
int _gameId;
void errorString(const char *buf_input, char *buf_output);
@@ -63,39 +85,13 @@
}
};
-}
-
extern char *savePath;
#define ASSERT_PTR assert
#define ASSERT assert
-#pragma pack(1)
-
#define BOOT_PRC_NAME "AUTO00.PRC"
-#include "cine/font.h"
-#include "cine/various.h"
-#include "cine/flip_support.h"
-#include "cine/texte.h"
-#include "cine/object.h"
-#include "cine/rel.h"
-#include "cine/script.h"
-#include "cine/part.h"
-#include "cine/prc.h"
-#include "cine/main_loop.h"
-#include "cine/resource.h"
-#include "cine/msg.h"
-#include "cine/bg.h"
-#include "cine/pal.h"
-#include "cine/gfx.h"
-#include "cine/anim.h"
-#include "cine/auto00.h"
-#include "cine/unpack.h"
-#include "cine/bg_list.h"
-#include "cine/sfx_player.h"
-#include "cine/sound_driver.h"
-
enum {
VAR_MOUSE_X_MODE = 253,
VAR_MOUSE_X_POS = 249,
@@ -105,4 +101,6 @@
extern AdlibMusic *g_cine_adlib;
+} // End of namespace Cine
+
#endif
Modified: scummvm/trunk/engines/cine/flip_support.cpp
===================================================================
--- scummvm/trunk/engines/cine/flip_support.cpp 2006-02-24 23:49:57 UTC (rev 20850)
+++ scummvm/trunk/engines/cine/flip_support.cpp 2006-02-25 00:26:14 UTC (rev 20851)
@@ -24,6 +24,8 @@
#include "cine/cine.h"
+namespace Cine {
+
void flipU16(uint16 * pVar) {
*pVar = (((*pVar) & 0xFF) << 8) | (((*pVar) & 0xFF00) >> 8);
}
@@ -40,3 +42,5 @@
*pVar = (part2) | ((uint32) part1 << 16);
}
+
+} // End of namespace Cine
Modified: scummvm/trunk/engines/cine/flip_support.h
===================================================================
--- scummvm/trunk/engines/cine/flip_support.h 2006-02-24 23:49:57 UTC (rev 20850)
+++ scummvm/trunk/engines/cine/flip_support.h 2006-02-25 00:26:14 UTC (rev 20851)
@@ -25,7 +25,11 @@
#ifndef CINE_FLIPSUPPORT_H_
#define CINE_FLIPSUPPORT_H_
+namespace Cine {
+
void flipU16(uint16 *);
void flipU32(uint32 *);
+} // End of namespace Cine
+
#endif
Modified: scummvm/trunk/engines/cine/font.cpp
===================================================================
--- scummvm/trunk/engines/cine/font.cpp 2006-02-24 23:49:57 UTC (rev 20850)
+++ scummvm/trunk/engines/cine/font.cpp 2006-02-25 00:26:14 UTC (rev 20851)
@@ -24,6 +24,8 @@
#include "cine/cine.h"
+namespace Cine {
+
characterEntry fontParamTable[256] = {
{ 0, 0}, { 0, 0}, { 0, 0}, { 0, 0}, { 0, 0}, { 0, 0}, { 0, 0}, { 0, 0},
{ 0, 0}, { 0, 0}, { 0, 0}, { 0, 0}, { 0, 0}, { 0, 0}, { 0, 0}, { 0, 0},
@@ -60,3 +62,5 @@
{ 0, 0}, { 0, 0}, { 0, 0}, { 0, 0}, { 0, 0}, { 0, 0}, { 0, 0}, { 0, 0},
{ 0, 0}, { 0, 0}, { 0, 0}, { 0, 0}, { 0, 0}, { 0, 0}, { 0, 0}, { 0, 0}
};
+
+} // End of namespace Cine
Modified: scummvm/trunk/engines/cine/font.h
===================================================================
--- scummvm/trunk/engines/cine/font.h 2006-02-24 23:49:57 UTC (rev 20850)
+++ scummvm/trunk/engines/cine/font.h 2006-02-25 00:26:14 UTC (rev 20851)
@@ -25,6 +25,8 @@
#ifndef CINE_FONT_H_
#define CINE_FONT_H_
+namespace Cine {
+
struct characterEntry {
uint8 characterIdx;
uint8 characterWidth;
@@ -34,4 +36,6 @@
extern characterEntry fontParamTable[256];
+} // End of namespace Cine
+
#endif
Modified: scummvm/trunk/engines/cine/gfx.cpp
===================================================================
--- scummvm/trunk/engines/cine/gfx.cpp 2006-02-24 23:49:57 UTC (rev 20850)
+++ scummvm/trunk/engines/cine/gfx.cpp 2006-02-25 00:26:14 UTC (rev 20851)
@@ -24,6 +24,8 @@
#include "cine/cine.h"
+namespace Cine {
+
byte *screenBuffer;
uint16 c_palette[256];
@@ -288,3 +290,5 @@
}
}
}
+
+} // End of namespace Cine
Modified: scummvm/trunk/engines/cine/gfx.h
===================================================================
--- scummvm/trunk/engines/cine/gfx.h 2006-02-24 23:49:57 UTC (rev 20850)
+++ scummvm/trunk/engines/cine/gfx.h 2006-02-25 00:26:14 UTC (rev 20851)
@@ -25,6 +25,8 @@
#ifndef CINE_GFX_H_
#define CINE_GFX_H_
+namespace Cine {
+
void gfxDrawSprite(uint8 *src4, uint16 sw, uint16 sh, uint8 *dst4, int16 sx, int16 sy);
extern unsigned char *page0;
@@ -66,4 +68,6 @@
void gfxDrawPlainBoxRaw(int16 x1, int16 y1, int16 x2, int16 y2, uint8 color, uint8 *page);
void drawSpriteRaw2(uint8 *spritePtr, uint8 transColor, int16 width, int16 height, uint8 *page, int16 x, int16 y);
+} // End of namespace Cine
+
#endif
Modified: scummvm/trunk/engines/cine/main_loop.cpp
===================================================================
--- scummvm/trunk/engines/cine/main_loop.cpp 2006-02-24 23:49:57 UTC (rev 20850)
+++ scummvm/trunk/engines/cine/main_loop.cpp 2006-02-25 00:26:14 UTC (rev 20851)
@@ -24,6 +24,8 @@
#include "cine/cine.h"
+namespace Cine {
+
mouseStatusStruct mouseData;
uint16 mouseRight = 0;
@@ -227,3 +229,5 @@
closeEngine7();
closePart();
}
+
+} // End of namespace Cine
Modified: scummvm/trunk/engines/cine/main_loop.h
===================================================================
--- scummvm/trunk/engines/cine/main_loop.h 2006-02-24 23:49:57 UTC (rev 20850)
+++ scummvm/trunk/engines/cine/main_loop.h 2006-02-25 00:26:14 UTC (rev 20851)
@@ -25,7 +25,11 @@
#ifndef CINE_MAINLOOP_H_
#define CINE_MAINLOOP_H_
+namespace Cine {
+
void mainLoop(int bootScriptIdx);
void manageEvents(void);
+} // End of namespace Cine
+
#endif
Modified: scummvm/trunk/engines/cine/msg.cpp
===================================================================
--- scummvm/trunk/engines/cine/msg.cpp 2006-02-24 23:49:57 UTC (rev 20850)
+++ scummvm/trunk/engines/cine/msg.cpp 2006-02-25 00:26:14 UTC (rev 20851)
@@ -24,6 +24,8 @@
#include "cine/cine.h"
+namespace Cine {
+
uint16 msgVar0;
void loadMsg(char *pMsgName) {
@@ -73,3 +75,5 @@
}
}
}
+
+} // End of namespace Cine
Modified: scummvm/trunk/engines/cine/msg.h
===================================================================
--- scummvm/trunk/engines/cine/msg.h 2006-02-24 23:49:57 UTC (rev 20850)
+++ scummvm/trunk/engines/cine/msg.h 2006-02-25 00:26:14 UTC (rev 20851)
@@ -25,6 +25,10 @@
#ifndef CINE_MSG_H_
#define CINE_MSG_H_
+namespace Cine {
+
void loadMsg(char *pMsgName);
+} // End of namespace Cine
+
#endif
Modified: scummvm/trunk/engines/cine/object.cpp
===================================================================
--- scummvm/trunk/engines/cine/object.cpp 2006-02-24 23:49:57 UTC (rev 20850)
+++ scummvm/trunk/engines/cine/object.cpp 2006-02-25 00:26:14 UTC (rev 20851)
@@ -24,6 +24,8 @@
#include "cine/cine.h"
+namespace Cine {
+
objectStruct objectTable[NUM_MAX_OBJECT];
uint16 globalVars[NUM_MAX_OBJECTDATA];
overlayHeadElement overlayHead;
@@ -474,3 +476,5 @@
return 0;
}
+
+} // End of namespace Cine
Modified: scummvm/trunk/engines/cine/object.h
===================================================================
--- scummvm/trunk/engines/cine/object.h 2006-02-24 23:49:57 UTC (rev 20850)
+++ scummvm/trunk/engines/cine/object.h 2006-02-25 00:26:14 UTC (rev 20851)
@@ -25,6 +25,8 @@
#ifndef CINE_OBJECT_H_
#define CINE_OBJECT_H_
+namespace Cine {
+
typedef struct {
int16 x;
int16 y;
@@ -73,4 +75,6 @@
void subObjectParam(uint8 objIdx, uint8 paramIdx, int16 newValue);
uint8 compareObjectParam(uint8 objIdx, uint8 param1, int16 param2);
+} // End of namespace Cine
+
#endif
Modified: scummvm/trunk/engines/cine/pal.cpp
===================================================================
--- scummvm/trunk/engines/cine/pal.cpp 2006-02-24 23:49:57 UTC (rev 20850)
+++ scummvm/trunk/engines/cine/pal.cpp 2006-02-25 00:26:14 UTC (rev 20851)
@@ -24,6 +24,8 @@
#include "cine/cine.h"
+namespace Cine {
+
uint16 tempPalette[256];
uint8 colorMode256 = 0;
@@ -119,3 +121,5 @@
}
}
}
+
+} // End of namespace Cine
Modified: scummvm/trunk/engines/cine/pal.h
===================================================================
--- scummvm/trunk/engines/cine/pal.h 2006-02-24 23:49:57 UTC (rev 20850)
+++ scummvm/trunk/engines/cine/pal.h 2006-02-25 00:26:14 UTC (rev 20851)
@@ -25,6 +25,8 @@
#ifndef CINE_PAL_H_
#define CINE_PAL_H_
+namespace Cine {
+
struct palEntryStruct {
char name[10];
uint8 pal1[16];
@@ -41,4 +43,6 @@
void loadRelatedPalette(const char *fileName);
+} // End of namespace Cine
+
#endif
Modified: scummvm/trunk/engines/cine/part.cpp
===================================================================
--- scummvm/trunk/engines/cine/part.cpp 2006-02-24 23:49:57 UTC (rev 20850)
+++ scummvm/trunk/engines/cine/part.cpp 2006-02-25 00:26:14 UTC (rev 20851)
@@ -24,6 +24,8 @@
#include "cine/cine.h"
+namespace Cine {
+
uint16 numElementInPart;
uint16 partVar1;
@@ -217,3 +219,5 @@
return dataPtr;
}
+
+} // End of namespace Cine
Modified: scummvm/trunk/engines/cine/part.h
===================================================================
--- scummvm/trunk/engines/cine/part.h 2006-02-24 23:49:57 UTC (rev 20850)
+++ scummvm/trunk/engines/cine/part.h 2006-02-25 00:26:14 UTC (rev 20851)
@@ -25,6 +25,8 @@
#ifndef CINE_PART_H_
#define CINE_PART_H_
+namespace Cine {
+
typedef struct {
char part_name[10];
uint32 varA; /* unused */
@@ -63,4 +65,6 @@
uint8 *readBundleFile(int16 foundFileIdx);
+} // End of namespace Cine
+
#endif
Modified: scummvm/trunk/engines/cine/prc.cpp
===================================================================
--- scummvm/trunk/engines/cine/prc.cpp 2006-02-24 23:49:57 UTC (rev 20850)
+++ scummvm/trunk/engines/cine/prc.cpp 2006-02-25 00:26:14 UTC (rev 20851)
@@ -24,6 +24,8 @@
#include "cine/cine.h"
+namespace Cine {
+
prcLinkedListStruct globalScriptsHead;
prcLinkedListStruct objScriptList;
@@ -140,3 +142,5 @@
}
}
}
+
+} // End of namespace Cine
Modified: scummvm/trunk/engines/cine/prc.h
===================================================================
--- scummvm/trunk/engines/cine/prc.h 2006-02-24 23:49:57 UTC (rev 20850)
+++ scummvm/trunk/engines/cine/prc.h 2006-02-25 00:26:14 UTC (rev 20851)
@@ -25,6 +25,8 @@
#ifndef CINE_PRC_H_
#define CINE_PRC_H_
+namespace Cine {
+
struct prcLinkedListStruct {
struct prcLinkedListStruct *next;
int16 stack[SCRIPT_STACK_SIZE];
@@ -44,4 +46,6 @@
void freePrcLinkedList(void);
void loadPrc(const char *pPrcName);
+} // End of namespace Cine
+
#endif
Modified: scummvm/trunk/engines/cine/rel.cpp
===================================================================
--- scummvm/trunk/engines/cine/rel.cpp 2006-02-24 23:49:57 UTC (rev 20850)
+++ scummvm/trunk/engines/cine/rel.cpp 2006-02-25 00:26:14 UTC (rev 20851)
@@ -24,6 +24,8 @@
#include "cine/cine.h"
+namespace Cine {
+
RelObjectScript relTable[NUM_MAX_REL];
void resetObjectScriptHead(void) {
@@ -107,3 +109,5 @@
}
#endif
}
+
+} // End of namespace Cine
Modified: scummvm/trunk/engines/cine/rel.h
===================================================================
--- scummvm/trunk/engines/cine/rel.h 2006-02-24 23:49:57 UTC (rev 20850)
+++ scummvm/trunk/engines/cine/rel.h 2006-02-25 00:26:14 UTC (rev 20851)
@@ -25,6 +25,8 @@
#ifndef CINE_REL_H_
#define CINE_REL_H_
+namespace Cine {
+
struct RelObjectScript {
char *data;
uint16 size;
@@ -42,4 +44,6 @@
void loadRel(char *pRelName);
+} // End of namespace Cine
+
#endif
Modified: scummvm/trunk/engines/cine/resource.cpp
===================================================================
--- scummvm/trunk/engines/cine/resource.cpp 2006-02-24 23:49:57 UTC (rev 20850)
+++ scummvm/trunk/engines/cine/resource.cpp 2006-02-25 00:26:14 UTC (rev 20851)
@@ -24,5 +24,9 @@
#include "cine/cine.h"
+namespace Cine {
+
void checkDataDisk(int16 param) {
}
+
+} // End of namespace Cine
Modified: scummvm/trunk/engines/cine/resource.h
===================================================================
--- scummvm/trunk/engines/cine/resource.h 2006-02-24 23:49:57 UTC (rev 20850)
+++ scummvm/trunk/engines/cine/resource.h 2006-02-25 00:26:14 UTC (rev 20851)
@@ -25,6 +25,10 @@
#ifndef CINE_RESOURCE_H_
#define CINE_RESOURCE_H_
+namespace Cine {
+
void checkDataDisk(int16 param);
+} // End of namespace Cine
+
#endif
Modified: scummvm/trunk/engines/cine/script.cpp
===================================================================
--- scummvm/trunk/engines/cine/script.cpp 2006-02-24 23:49:57 UTC (rev 20850)
+++ scummvm/trunk/engines/cine/script.cpp 2006-02-25 00:26:14 UTC (rev 20851)
@@ -24,6 +24,8 @@
#include "cine/cine.h"
+namespace Cine {
+
void addGfxElementA0(int16 param1, int16 param2) {
overlayHeadElement *currentHead = &overlayHead;
overlayHeadElement *tempHead = currentHead;
@@ -3794,3 +3796,5 @@
}
#endif
+
+} // End of namespace Cine
Modified: scummvm/trunk/engines/cine/script.h
===================================================================
--- scummvm/trunk/engines/cine/script.h 2006-02-24 23:49:57 UTC (rev 20850)
+++ scummvm/trunk/engines/cine/script.h 2006-02-25 00:26:14 UTC (rev 20851)
@@ -25,6 +25,8 @@
#ifndef CINE_SCRIPT_H_
#define CINE_SCRIPT_H_
+namespace Cine {
+
#define SCRIPT_STACK_SIZE 50
typedef struct {
@@ -60,4 +62,6 @@
void purgeList1(void);
void purgeList0(void);
+} // End of namespace Cine
+
#endif
Modified: scummvm/trunk/engines/cine/sfx_player.cpp
===================================================================
--- scummvm/trunk/engines/cine/sfx_player.cpp 2006-02-24 23:49:57 UTC (rev 20850)
+++ scummvm/trunk/engines/cine/sfx_player.cpp 2006-02-25 00:26:14 UTC (rev 20851)
@@ -28,6 +28,8 @@
#include "cine/cine.h"
+namespace Cine {
+
uint16 snd_eventsDelay;
int snd_songIsPlaying = 0;
uint8 snd_nullInstrument[] = { 0, 0 };
@@ -265,3 +267,5 @@
}
}
}
+
+} // End of namespace Cine
Modified: scummvm/trunk/engines/cine/sfx_player.h
===================================================================
--- scummvm/trunk/engines/cine/sfx_player.h 2006-02-24 23:49:57 UTC (rev 20850)
+++ scummvm/trunk/engines/cine/sfx_player.h 2006-02-25 00:26:14 UTC (rev 20851)
@@ -25,6 +25,8 @@
#ifndef CINE_SFXPLAYER_H_
#define CINE_SFXPLAYER_H_
+namespace Cine {
+
typedef struct {
char name[14];
uint32 offset;
@@ -56,4 +58,6 @@
extern void snd_handleEvents();
extern void snd_handlePattern(int channelNum, const uint8 *patternData);
+} // End of namespace Cine
+
#endif /* _SFXPLAYER_H_ */
Modified: scummvm/trunk/engines/cine/sound_driver.cpp
===================================================================
--- scummvm/trunk/engines/cine/sound_driver.cpp 2006-02-24 23:49:57 UTC (rev 20850)
+++ scummvm/trunk/engines/cine/sound_driver.cpp 2006-02-25 00:26:14 UTC (rev 20851)
@@ -28,6 +28,8 @@
#include "sound/mixer.h"
#include "sound/fmopl.h"
+namespace Cine {
+
uint8 snd_useAdlib = 0;
uint16 snd_fadeOutCounter = 0;
uint16 snd_songTicksCounter = 0;
@@ -396,3 +398,5 @@
AdlibMusic::~AdlibMusic(void) {
_mixer->setupPremix(NULL);
}
+
+} // End of namespace Cine
Modified: scummvm/trunk/engines/cine/sound_driver.h
===================================================================
--- scummvm/trunk/engines/cine/sound_driver.h 2006-02-24 23:49:57 UTC (rev 20850)
+++ scummvm/trunk/engines/cine/sound_driver.h 2006-02-25 00:26:14 UTC (rev 20851)
@@ -25,6 +25,15 @@
#ifndef CINE_SNDDRIVER_H_
#define CINE_SNDDRIVER_H_
+#include "sound/audiostream.h"
+#include "sound/fmopl.h"
+
+namespace Audio {
+ class Mixer;
+}
+
+namespace Cine {
+
#define ADLIB_REG_TIMER_1_DATA 2
#define ADLIB_REG_TIMER_CONTROL_FLAGS 4
#define ADLIB_REG_AM_VIBRATO_EG_KS 0x20
@@ -53,13 +62,6 @@
extern void snd_adlibDriverStopSong();
extern void snd_resetChannel(int channelNum);
-#include "sound/audiostream.h"
-#include "sound/fmopl.h"
-
-namespace Audio {
- class Mixer;
-}
-
class AdlibMusic : public AudioStream {
public:
AdlibMusic(Audio::Mixer * pMixer);
@@ -87,4 +89,6 @@
void premixerCall(int16 *buf, uint len);
};
+} // End of namespace Cine
+
#endif /* CINE_SNDDRIVER_H_ */
Modified: scummvm/trunk/engines/cine/texte.cpp
===================================================================
--- scummvm/trunk/engines/cine/texte.cpp 2006-02-24 23:49:57 UTC (rev 20850)
+++ scummvm/trunk/engines/cine/texte.cpp 2006-02-25 00:26:14 UTC (rev 20851)
@@ -24,6 +24,8 @@
#include "cine/cine.h"
+namespace Cine {
+
uint8 *textDataPtr;
uint8 textTable[256][2][16 * 8];
@@ -73,3 +75,5 @@
pFileHandle.close();
}
+
+} // End of namespace Cine
Modified: scummvm/trunk/engines/cine/texte.h
===================================================================
--- scummvm/trunk/engines/cine/texte.h 2006-02-24 23:49:57 UTC (rev 20850)
+++ scummvm/trunk/engines/cine/texte.h 2006-02-25 00:26:14 UTC (rev 20851)
@@ -25,9 +25,13 @@
#ifndef CINE_TEXTE_H_
#define CINE_TEXTE_H_
+namespace Cine {
+
extern uint8 *textDataPtr;
extern uint8 textTable[256][2][16 * 8];
void loadTextData(const char *pFileName, uint8 *pDestinationBuffer);
+} // End of namespace Cine
+
#endif
Modified: scummvm/trunk/engines/cine/unpack.cpp
===================================================================
--- scummvm/trunk/engines/cine/unpack.cpp 2006-02-24 23:49:57 UTC (rev 20850)
+++ scummvm/trunk/engines/cine/unpack.cpp 2006-02-25 00:26:14 UTC (rev 20851)
@@ -24,6 +24,8 @@
#include "cine/cine.h"
+namespace Cine {
+
uint32 crc; // variable at 5C5A
uint32 bitbucket; // dx:bx
@@ -149,3 +151,5 @@
return 0;
}
}
+
+} // End of namespace Cine
Modified: scummvm/trunk/engines/cine/unpack.h
===================================================================
--- scummvm/trunk/engines/cine/unpack.h 2006-02-24 23:49:57 UTC (rev 20850)
+++ scummvm/trunk/engines/cine/unpack.h 2006-02-25 00:26:14 UTC (rev 20851)
@@ -25,6 +25,10 @@
#ifndef CINE_UNPACK_H_
#define CINE_UNPACK_H_
+namespace Cine {
+
int decomp(uint8 *in, uint8 *out, int size);
+} // End of namespace Cine
+
#endif
Modified: scummvm/trunk/engines/cine/various.cpp
===================================================================
--- scummvm/trunk/engines/cine/various.cpp 2006-02-24 23:49:57 UTC (rev 20850)
+++ scummvm/trunk/engines/cine/various.cpp 2006-02-25 00:26:14 UTC (rev 20851)
@@ -24,6 +24,8 @@
#include "cine/cine.h"
+namespace Cine {
+
int16 allowSystemMenu = 0;
int16 commandVar3[4];
@@ -2974,3 +2976,5 @@
currentHead = tempHead->next;
}
}
+
+} // End of namespace Cine
Modified: scummvm/trunk/engines/cine/various.h
===================================================================
--- scummvm/trunk/engines/cine/various.h 2006-02-24 23:49:57 UTC (rev 20850)
+++ scummvm/trunk/engines/cine/various.h 2006-02-25 00:26:14 UTC (rev 20851)
@@ -27,6 +27,8 @@
#include "cine/cine.h"
+namespace Cine {
+
extern int gameType;
typedef char commandeType[20];
@@ -187,4 +189,6 @@
void resetUnkList();
void processUnkList(void);
+} // End of namespace Cine
+
#endif
More information about the Scummvm-git-logs
mailing list