aboutsummaryrefslogtreecommitdiff
path: root/engines/cruise
diff options
context:
space:
mode:
authorSven Hesse2007-04-27 15:35:28 +0000
committerSven Hesse2007-04-27 15:35:28 +0000
commit1ef6a1a7a1e76945ee37ac60989a79472a131739 (patch)
tree729166a54eeddfd2945c2bf6c56e239e33cfb367 /engines/cruise
parent8c829072a969372d8df8a8aac703791d0ed192a3 (diff)
downloadscummvm-rg350-1ef6a1a7a1e76945ee37ac60989a79472a131739.tar.gz
scummvm-rg350-1ef6a1a7a1e76945ee37ac60989a79472a131739.tar.bz2
scummvm-rg350-1ef6a1a7a1e76945ee37ac60989a79472a131739.zip
Fixing compilation for me
svn-id: r26610
Diffstat (limited to 'engines/cruise')
-rw-r--r--engines/cruise/actor.cpp2
-rw-r--r--engines/cruise/actor.h4
-rw-r--r--engines/cruise/ctp.h2
-rw-r--r--engines/cruise/dataLoader.cpp2
-rw-r--r--engines/cruise/dataLoader.h2
-rw-r--r--engines/cruise/font.cpp2
-rw-r--r--engines/cruise/font.h4
-rw-r--r--engines/cruise/object.h2
-rw-r--r--engines/cruise/perso.h2
-rw-r--r--engines/cruise/stringSupport.cpp14
-rw-r--r--engines/cruise/stringSupport.h8
-rw-r--r--engines/cruise/vars.h2
12 files changed, 23 insertions, 23 deletions
diff --git a/engines/cruise/actor.cpp b/engines/cruise/actor.cpp
index 35c852a82a..0f684555fc 100644
--- a/engines/cruise/actor.cpp
+++ b/engines/cruise/actor.cpp
@@ -1077,4 +1077,4 @@ void processActors(void)
}
}
}
-} // End of namespace Cruise \ No newline at end of file
+} // End of namespace Cruise
diff --git a/engines/cruise/actor.h b/engines/cruise/actor.h
index 57db753460..750d2a8282 100644
--- a/engines/cruise/actor.h
+++ b/engines/cruise/actor.h
@@ -33,7 +33,7 @@ enum animPhase
ANIM_PHASE_STATIC = 1,
ANIM_PHASE_MOVE = 2,
ANIM_PHASE_STATIC_END = 3,
- ANIM_PHASE_END = 4,
+ ANIM_PHASE_END = 4
};
typedef enum animPhase animPhase;
@@ -71,4 +71,4 @@ void processActors(void);
void getPixel(int x, int y);
} // End of namespace Cruise
-#endif \ No newline at end of file
+#endif
diff --git a/engines/cruise/ctp.h b/engines/cruise/ctp.h
index 397f87a5d6..b1a7449c87 100644
--- a/engines/cruise/ctp.h
+++ b/engines/cruise/ctp.h
@@ -61,4 +61,4 @@ int ctpProc2(int varX, int varY, int paramX, int paramY);
} // End of namespace Cruise
-#endif \ No newline at end of file
+#endif
diff --git a/engines/cruise/dataLoader.cpp b/engines/cruise/dataLoader.cpp
index dcc1e8cca6..4eb1ba09b7 100644
--- a/engines/cruise/dataLoader.cpp
+++ b/engines/cruise/dataLoader.cpp
@@ -34,7 +34,7 @@ enum fileTypeEnum
type_UNK,
type_SPL,
type_SET,
- type_FNT,
+ type_FNT
};
typedef enum fileTypeEnum fileTypeEnum;
diff --git a/engines/cruise/dataLoader.h b/engines/cruise/dataLoader.h
index 859a0372dc..b52aa96dae 100644
--- a/engines/cruise/dataLoader.h
+++ b/engines/cruise/dataLoader.h
@@ -35,4 +35,4 @@ int loadFullBundle(uint8* name, int startIdx);
} // End of namespace Cruise
-#endif \ No newline at end of file
+#endif
diff --git a/engines/cruise/font.cpp b/engines/cruise/font.cpp
index 65883d6c6f..fce90460d5 100644
--- a/engines/cruise/font.cpp
+++ b/engines/cruise/font.cpp
@@ -121,7 +121,7 @@ int32 getTextLineCount(int32 rightBorder_X, int32 wordSpacingWidth, uint8* ptr,
}
}
-void loadFNT(void* fileNameChar)
+void loadFNT(const void* fileNameChar)
{
uint8 header[6];
int32 fontSize;
diff --git a/engines/cruise/font.h b/engines/cruise/font.h
index b0810d0384..6946be9639 100644
--- a/engines/cruise/font.h
+++ b/engines/cruise/font.h
@@ -27,7 +27,7 @@
namespace Cruise {
-void loadFNT(void* fileName);
+void loadFNT(const void* fileName);
void loadSystemFont(void);
//////////////////////////////////////////////////
@@ -46,4 +46,4 @@ void drawString(int32 x, int32 y, uint8* string, uint8* buffer, uint8 color, int
} // End of namespace Cruise
-#endif \ No newline at end of file
+#endif
diff --git a/engines/cruise/object.h b/engines/cruise/object.h
index 620de44879..256ab81cb7 100644
--- a/engines/cruise/object.h
+++ b/engines/cruise/object.h
@@ -91,4 +91,4 @@ int16 getMultipleObjectParam(int16 overlayIdx,int16 objectIdx,objectParamsQuery*
} // End of namespace Cruise
-#endif \ No newline at end of file
+#endif
diff --git a/engines/cruise/perso.h b/engines/cruise/perso.h
index 9d316e17a9..e90fbd075e 100644
--- a/engines/cruise/perso.h
+++ b/engines/cruise/perso.h
@@ -53,4 +53,4 @@ void affiche_chemin(int16 persoIdx, int16* returnVar);
} // End of namespace Cruise
-#endif \ No newline at end of file
+#endif
diff --git a/engines/cruise/stringSupport.cpp b/engines/cruise/stringSupport.cpp
index 8e9a5fa5ac..1421ba7943 100644
--- a/engines/cruise/stringSupport.cpp
+++ b/engines/cruise/stringSupport.cpp
@@ -26,24 +26,24 @@
namespace Cruise {
-void strcpyuint8(void* dest, void* source)
+void strcpyuint8(void* dest, const void* source)
{
- strcpy((char*)dest,(char*)source);
+ strcpy((char*)dest,(const char*)source);
}
-void strcatuint8(void* dest, void* source)
+void strcatuint8(void* dest, const void* source)
{
- strcat((char*)dest,(char*)source);
+ strcat((char*)dest,(const char*)source);
}
-uint8 strcmpuint8(void* string1, void* string2)
+uint8 strcmpuint8(const void* string1, const void* string2)
{
return strcmp((char*)string1,(char*)string2);
}
-FILE* fopenuint8(void* name, void* param)
+FILE* fopenuint8(void* name, const void* param)
{
- return fopen((char*)name,(char*)param);
+ return fopen((char*)name,(const char*)param);
}
} // End of namespace Cruise
diff --git a/engines/cruise/stringSupport.h b/engines/cruise/stringSupport.h
index dca3091520..d5d9b33702 100644
--- a/engines/cruise/stringSupport.h
+++ b/engines/cruise/stringSupport.h
@@ -27,10 +27,10 @@
namespace Cruise {
-void strcpyuint8(void* dest, void* source);
-void strcatuint8(void* dest, void* source);
-uint8 strcmpuint8(void* string1, void* string2);
-FILE* fopenuint8(void* name, void* param);
+void strcpyuint8(void* dest, const void* source);
+void strcatuint8(void* dest, const void* source);
+uint8 strcmpuint8(const void* string1, const void* string2);
+FILE* fopenuint8(void* name, const void* param);
} // End of namespace Cruise
diff --git a/engines/cruise/vars.h b/engines/cruise/vars.h
index 11e36fe6ff..3fda98b0e0 100644
--- a/engines/cruise/vars.h
+++ b/engines/cruise/vars.h
@@ -337,4 +337,4 @@ extern uint8 scaledScreen[640*400];
} // End of namespace Cruise
-#endif \ No newline at end of file
+#endif