aboutsummaryrefslogtreecommitdiff
path: root/simon
diff options
context:
space:
mode:
authorMax Horn2002-08-21 16:07:07 +0000
committerMax Horn2002-08-21 16:07:07 +0000
commitce46866403fdcc479cf9d67e4d430409b15dadc3 (patch)
tree75ebfaa1ed13f549959d76d3ce101c3e66f5451b /simon
parent662256f25dbe43abf67077a804e225738765f009 (diff)
downloadscummvm-rg350-ce46866403fdcc479cf9d67e4d430409b15dadc3.tar.gz
scummvm-rg350-ce46866403fdcc479cf9d67e4d430409b15dadc3.tar.bz2
scummvm-rg350-ce46866403fdcc479cf9d67e4d430409b15dadc3.zip
Initial revision
svn-id: r4785
Diffstat (limited to 'simon')
-rw-r--r--simon/debug.cpp (renamed from simon/simondebug.cpp)4
-rw-r--r--simon/intern.h (renamed from simon/simonintern.h)0
-rw-r--r--simon/items.cpp (renamed from simon/simonitems.cpp)4
-rw-r--r--simon/midi.cpp8
-rw-r--r--simon/res.cpp (renamed from simon/simonres.cpp)4
-rw-r--r--simon/simon.cpp6
-rw-r--r--simon/sys.cpp (renamed from simon/simonsys.cpp)2
-rw-r--r--simon/verb.cpp (renamed from simon/simonverb.cpp)4
-rw-r--r--simon/vga.cpp (renamed from simon/simonvga.cpp)4
9 files changed, 18 insertions, 18 deletions
diff --git a/simon/simondebug.cpp b/simon/debug.cpp
index ed7febe739..6b1902c6b7 100644
--- a/simon/simondebug.cpp
+++ b/simon/debug.cpp
@@ -21,8 +21,8 @@
// Simon debug functions
#include "stdafx.h"
-#include "simon.h"
-#include "simonintern.h"
+#include "simon/simon.h"
+#include "simon/intern.h"
#ifdef SIMONDEBUG
#define SIMON2
diff --git a/simon/simonintern.h b/simon/intern.h
index 2536534844..2536534844 100644
--- a/simon/simonintern.h
+++ b/simon/intern.h
diff --git a/simon/simonitems.cpp b/simon/items.cpp
index 39e95d3a70..4baeae0ec8 100644
--- a/simon/simonitems.cpp
+++ b/simon/items.cpp
@@ -21,8 +21,8 @@
// Item script opcodes for Simon1/Simon2
#include "stdafx.h"
-#include "simon.h"
-#include "simonintern.h"
+#include "simon/simon.h"
+#include "simon/intern.h"
#ifdef _WIN32_WCE
diff --git a/simon/midi.cpp b/simon/midi.cpp
index b9cf3ac867..a55ab0f3ec 100644
--- a/simon/midi.cpp
+++ b/simon/midi.cpp
@@ -22,10 +22,10 @@
#include "stdafx.h"
#include "scummsys.h"
-#include "system.h"
-#include "../sound/mididrv.h"
-#include "../sound/mixer.h"
-#include "simon.h"
+#include "common/system.h"
+#include "sound/mididrv.h"
+#include "sound/mixer.h"
+#include "simon/simon.h"
void MidiPlayer::read_from_file(void *dst, uint size)
{
diff --git a/simon/simonres.cpp b/simon/res.cpp
index 7b36d1f770..8a059486bd 100644
--- a/simon/simonres.cpp
+++ b/simon/res.cpp
@@ -21,8 +21,8 @@
// Resource file routines for Simon1/Simon2
#include "stdafx.h"
-#include "simon.h"
-#include "simonintern.h"
+#include "simon/simon.h"
+#include "simon/intern.h"
// Script opcodes to load into memory
static const char *const opcode_arg_table_simon1win[256] = {
diff --git a/simon/simon.cpp b/simon/simon.cpp
index a60234d7a2..d3b8a8391f 100644
--- a/simon/simon.cpp
+++ b/simon/simon.cpp
@@ -20,9 +20,9 @@
*/
#include "stdafx.h"
-#include "simon.h"
-#include "simonintern.h"
-#include "gameDetector.h"
+#include "simon/simon.h"
+#include "simon/intern.h"
+#include "common/gameDetector.h"
#include <errno.h>
#include <time.h>
diff --git a/simon/simonsys.cpp b/simon/sys.cpp
index 0bef256764..5086ba9547 100644
--- a/simon/simonsys.cpp
+++ b/simon/sys.cpp
@@ -20,7 +20,7 @@
*/
#include "stdafx.h"
-#include "simon.h"
+#include "simon/simon.h"
uint fileReadByte(FILE *in)
{
diff --git a/simon/simonverb.cpp b/simon/verb.cpp
index 662237cd68..a81627bff2 100644
--- a/simon/simonverb.cpp
+++ b/simon/verb.cpp
@@ -21,8 +21,8 @@
// Verb and hitarea handling
#include "stdafx.h"
-#include "simon.h"
-#include "simonintern.h"
+#include "simon/simon.h"
+#include "simon/intern.h"
void SimonState::defocusHitarea()
{
diff --git a/simon/simonvga.cpp b/simon/vga.cpp
index 1c56d5295d..39d56d0c85 100644
--- a/simon/simonvga.cpp
+++ b/simon/vga.cpp
@@ -21,8 +21,8 @@
// Video script opcodes for Simon1/Simon2
#include "stdafx.h"
-#include "simon.h"
-#include "simonintern.h"
+#include "simon/simon.h"
+#include "simon/intern.h"
typedef void (SimonState::*VgaOpcodeProc) ();
static const uint16 vc_get_out_of_code = 0;