[Scummvm-cvs-logs] SF.net SVN: scummvm:[39253] scummvm/trunk
Kirben at users.sourceforge.net
Kirben at users.sourceforge.net
Mon Mar 9 03:25:29 CET 2009
Revision: 39253
http://scummvm.svn.sourceforge.net/scummvm/?rev=39253&view=rev
Author: Kirben
Date: 2009-03-09 02:25:29 +0000 (Mon, 09 Mar 2009)
Log Message:
-----------
Change Personal Nightmare support to optional, until setjmp/longjmp code is converted.
Modified Paths:
--------------
scummvm/trunk/configure
scummvm/trunk/engines/agos/agos.cpp
scummvm/trunk/engines/agos/agos.h
scummvm/trunk/engines/agos/cursor.cpp
scummvm/trunk/engines/agos/detection.cpp
scummvm/trunk/engines/agos/event.cpp
scummvm/trunk/engines/agos/gfx.cpp
scummvm/trunk/engines/agos/icons.cpp
scummvm/trunk/engines/agos/input.cpp
scummvm/trunk/engines/agos/pn.cpp
scummvm/trunk/engines/agos/res.cpp
scummvm/trunk/engines/agos/saveload.cpp
scummvm/trunk/engines/agos/script_pn.cpp
scummvm/trunk/engines/agos/string.cpp
scummvm/trunk/engines/agos/verb.cpp
scummvm/trunk/engines/agos/vga_pn.cpp
scummvm/trunk/engines/engines.mk
Modified: scummvm/trunk/configure
===================================================================
--- scummvm/trunk/configure 2009-03-09 02:07:06 UTC (rev 39252)
+++ scummvm/trunk/configure 2009-03-09 02:25:29 UTC (rev 39253)
@@ -100,6 +100,7 @@
add_engine m4 "M4/MADS" no
add_engine made "MADE" yes
add_engine parallaction "Parallaction" yes
+add_engine pn "Personal Nightmare" no
add_engine queen "Flight of the Amazon Queen" yes
add_engine saga "SAGA" yes "ihnm saga2"
add_engine ihnm "IHNM" yes
Modified: scummvm/trunk/engines/agos/agos.cpp
===================================================================
--- scummvm/trunk/engines/agos/agos.cpp 2009-03-09 02:07:06 UTC (rev 39252)
+++ scummvm/trunk/engines/agos/agos.cpp 2009-03-09 02:25:29 UTC (rev 39253)
@@ -851,6 +851,7 @@
AGOSEngine::setupGame();
}
+#ifdef ENABLE_PN
void AGOSEngine_PN::setupGame() {
gss = &simon1_settings;
_numVideoOpcodes = 57;
@@ -862,6 +863,7 @@
AGOSEngine::setupGame();
}
+#endif
void AGOSEngine::setupGame() {
allocItemHeap();
Modified: scummvm/trunk/engines/agos/agos.h
===================================================================
--- scummvm/trunk/engines/agos/agos.h 2009-03-09 02:07:06 UTC (rev 39252)
+++ scummvm/trunk/engines/agos/agos.h 2009-03-09 02:25:29 UTC (rev 39253)
@@ -1280,6 +1280,7 @@
virtual char *genSaveName(int slot);
};
+#ifdef ENABLE_PN
class AGOSEngine_PN : public AGOSEngine {
struct stackframe {
struct stackframe *nextframe;
@@ -1525,6 +1526,7 @@
const OpcodeEntryPN *_opcodesPN;
};
+#endif
class AGOSEngine_Elvira1 : public AGOSEngine {
public:
Modified: scummvm/trunk/engines/agos/cursor.cpp
===================================================================
--- scummvm/trunk/engines/agos/cursor.cpp 2009-03-09 02:07:06 UTC (rev 39252)
+++ scummvm/trunk/engines/agos/cursor.cpp 2009-03-09 02:25:29 UTC (rev 39253)
@@ -474,6 +474,7 @@
_litBoxFlag = 0;
}
+#ifdef ENABLE_PN
void AGOSEngine_PN::handleMouseMoved() {
if (_mouseHideCount) {
CursorMan.showMouse(false);
@@ -538,6 +539,7 @@
_needHitAreaRecalc = 0;
_litBoxFlag = 0;
}
+#endif
void AGOSEngine::handleMouseMoved() {
uint x;
Modified: scummvm/trunk/engines/agos/detection.cpp
===================================================================
--- scummvm/trunk/engines/agos/detection.cpp 2009-03-09 02:07:06 UTC (rev 39252)
+++ scummvm/trunk/engines/agos/detection.cpp 2009-03-09 02:25:29 UTC (rev 39253)
@@ -133,9 +133,11 @@
bool res = true;
switch (gd->gameType) {
+#ifdef ENABLE_PN
case AGOS::GType_PN:
*engine = new AGOS::AGOSEngine_PN(syst);
break;
+#endif
case AGOS::GType_ELVIRA1:
*engine = new AGOS::AGOSEngine_Elvira1(syst);
break;
Modified: scummvm/trunk/engines/agos/event.cpp
===================================================================
--- scummvm/trunk/engines/agos/event.cpp 2009-03-09 02:07:06 UTC (rev 39252)
+++ scummvm/trunk/engines/agos/event.cpp 2009-03-09 02:25:29 UTC (rev 39253)
@@ -613,6 +613,7 @@
_videoLockOut &= ~2;
}
+#ifdef ENABLE_PN
void AGOSEngine_PN::timerProc() {
if (_videoLockOut & 0x80E9 || _videoLockOut & 2)
return;
@@ -651,6 +652,7 @@
_videoLockOut &= ~2;
}
+#endif
void AGOSEngine::timerProc() {
if (_videoLockOut & 0x80E9 || _videoLockOut & 2)
Modified: scummvm/trunk/engines/agos/gfx.cpp
===================================================================
--- scummvm/trunk/engines/agos/gfx.cpp 2009-03-09 02:07:06 UTC (rev 39252)
+++ scummvm/trunk/engines/agos/gfx.cpp 2009-03-09 02:25:29 UTC (rev 39253)
@@ -1278,6 +1278,7 @@
_vcPtr = vc_ptr_org;
}
+#ifdef ENABLE_PN
void AGOSEngine_PN::setWindowImageEx(uint16 mode, uint16 vga_res) {
if (!_initMouse) {
_initMouse = 1;
@@ -1285,6 +1286,7 @@
}
setWindowImage(mode, vga_res);
}
+#endif
void AGOSEngine::setWindowImageEx(uint16 mode, uint16 vgaSpriteId) {
_window3Flag = 0;
Modified: scummvm/trunk/engines/agos/icons.cpp
===================================================================
--- scummvm/trunk/engines/agos/icons.cpp 2009-03-09 02:07:06 UTC (rev 39252)
+++ scummvm/trunk/engines/agos/icons.cpp 2009-03-09 02:25:29 UTC (rev 39253)
@@ -1039,6 +1039,7 @@
0x3C, 0x89, 0xC3, 0x00, 0x88, 0x88, 0x18, 0x03, 0x86, 0x23, 0x0C, 0x00
};
+#ifdef ENABLE_PN
// Personal Nightmare specific
void AGOSEngine_PN::drawIconHitBar() {
Graphics::Surface *screen = _system->lockScreen();
@@ -1118,5 +1119,6 @@
}
}
}
+#endif
} // End of namespace AGOS
Modified: scummvm/trunk/engines/agos/input.cpp
===================================================================
--- scummvm/trunk/engines/agos/input.cpp 2009-03-09 02:07:06 UTC (rev 39252)
+++ scummvm/trunk/engines/agos/input.cpp 2009-03-09 02:25:29 UTC (rev 39253)
@@ -606,6 +606,7 @@
return verbCode;
}
+#ifdef ENABLE_PN
// Personal Nightmare specific
void AGOSEngine_PN::clearInputLine() {
_inputting = 0;
@@ -729,6 +730,6 @@
_keyPressed.reset();
return false;
}
+#endif
-
} // End of namespace AGOS
Modified: scummvm/trunk/engines/agos/pn.cpp
===================================================================
--- scummvm/trunk/engines/agos/pn.cpp 2009-03-09 02:07:06 UTC (rev 39252)
+++ scummvm/trunk/engines/agos/pn.cpp 2009-03-09 02:25:29 UTC (rev 39253)
@@ -23,6 +23,8 @@
*
*/
+#ifdef ENABLE_PN
+
#include "common/config-manager.h"
#include "agos/intern.h"
@@ -291,3 +293,5 @@
}
} // End of namespace AGOS
+
+#endif
Modified: scummvm/trunk/engines/agos/res.cpp
===================================================================
--- scummvm/trunk/engines/agos/res.cpp 2009-03-09 02:07:06 UTC (rev 39252)
+++ scummvm/trunk/engines/agos/res.cpp 2009-03-09 02:25:29 UTC (rev 39253)
@@ -150,6 +150,7 @@
return itemArrayInited;
}
+#ifdef ENABLE_PN
void AGOSEngine_PN::loadGamePcFile() {
Common::File in;
@@ -189,6 +190,7 @@
error("Unknown compression format");
}
}
+#endif
void AGOSEngine::loadGamePcFile() {
Common::File in;
Modified: scummvm/trunk/engines/agos/saveload.cpp
===================================================================
--- scummvm/trunk/engines/agos/saveload.cpp 2009-03-09 02:07:06 UTC (rev 39252)
+++ scummvm/trunk/engines/agos/saveload.cpp 2009-03-09 02:25:29 UTC (rev 39253)
@@ -1553,6 +1553,7 @@
return result;
}
+#ifdef ENABLE_PN
// Personal Nightmare specific
bool AGOSEngine_PN::badload(int8 errorNum) {
if (errorNum == -2)
@@ -1673,5 +1674,6 @@
ct++;
}
}
+#endif
} // End of namespace AGOS
Modified: scummvm/trunk/engines/agos/script_pn.cpp
===================================================================
--- scummvm/trunk/engines/agos/script_pn.cpp 2009-03-09 02:07:06 UTC (rev 39252)
+++ scummvm/trunk/engines/agos/script_pn.cpp 2009-03-09 02:25:29 UTC (rev 39253)
@@ -23,6 +23,7 @@
*
*/
+#ifdef ENABLE_PN
#include "agos/agos.h"
#include "agos/vga.h"
@@ -1105,3 +1106,5 @@
}
} // End of namespace AGOS
+
+#endif
Modified: scummvm/trunk/engines/agos/string.cpp
===================================================================
--- scummvm/trunk/engines/agos/string.cpp 2009-03-09 02:07:06 UTC (rev 39252)
+++ scummvm/trunk/engines/agos/string.cpp 2009-03-09 02:25:29 UTC (rev 39253)
@@ -910,8 +910,8 @@
changeWindow(0);
}
+#ifdef ENABLE_PN
// Personal Nightmare specific
-
uint32 AGOSEngine_PN::ftext(uint32 base, int n) {
uint32 b = base;
int ct = n;
@@ -1549,5 +1549,6 @@
return origPtr;
}
+#endif
} // End of namespace AGOS
Modified: scummvm/trunk/engines/agos/verb.cpp
===================================================================
--- scummvm/trunk/engines/agos/verb.cpp 2009-03-09 02:07:06 UTC (rev 39252)
+++ scummvm/trunk/engines/agos/verb.cpp 2009-03-09 02:25:29 UTC (rev 39253)
@@ -1027,6 +1027,7 @@
_videoLockOut &= ~0x8000;
}
+#ifdef ENABLE_PN
// Personal Nightmare specific
void AGOSEngine_PN::boxController(uint x, uint y, uint mode) {
HitArea *best_ha;
@@ -1277,5 +1278,6 @@
_mouseString = messageList[ha->msg1];
_mousePrintFG++;
}
+#endif
} // End of namespace AGOS
Modified: scummvm/trunk/engines/agos/vga_pn.cpp
===================================================================
--- scummvm/trunk/engines/agos/vga_pn.cpp 2009-03-09 02:07:06 UTC (rev 39252)
+++ scummvm/trunk/engines/agos/vga_pn.cpp 2009-03-09 02:25:29 UTC (rev 39253)
@@ -23,9 +23,8 @@
*
*/
-// Video script opcodes for Simon1/Simon2
+#ifdef ENABLE_PN
-
#include "agos/agos.h"
#include "agos/intern.h"
#include "agos/vga.h"
@@ -221,3 +220,5 @@
}
} // End of namespace AGOS
+
+#endif
Modified: scummvm/trunk/engines/engines.mk
===================================================================
--- scummvm/trunk/engines/engines.mk 2009-03-09 02:07:06 UTC (rev 39252)
+++ scummvm/trunk/engines/engines.mk 2009-03-09 02:25:29 UTC (rev 39253)
@@ -20,7 +20,11 @@
ifdef ENABLE_AGOS
DEFINES += -DENABLE_AGOS=$(ENABLE_AGOS)
MODULES += engines/agos
+
+ifdef ENABLE_PN
+DEFINES += -DENABLE_PN
endif
+endif
ifdef ENABLE_CINE
DEFINES += -DENABLE_CINE=$(ENABLE_CINE)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list