[Scummvm-cvs-logs] SF.net SVN: scummvm: [26610] scummvm/trunk/engines/cruise
drmccoy at users.sourceforge.net
drmccoy at users.sourceforge.net
Fri Apr 27 17:35:29 CEST 2007
Revision: 26610
http://scummvm.svn.sourceforge.net/scummvm/?rev=26610&view=rev
Author: drmccoy
Date: 2007-04-27 08:35:28 -0700 (Fri, 27 Apr 2007)
Log Message:
-----------
Fixing compilation for me
Modified Paths:
--------------
scummvm/trunk/engines/cruise/actor.cpp
scummvm/trunk/engines/cruise/actor.h
scummvm/trunk/engines/cruise/ctp.h
scummvm/trunk/engines/cruise/dataLoader.cpp
scummvm/trunk/engines/cruise/dataLoader.h
scummvm/trunk/engines/cruise/font.cpp
scummvm/trunk/engines/cruise/font.h
scummvm/trunk/engines/cruise/object.h
scummvm/trunk/engines/cruise/perso.h
scummvm/trunk/engines/cruise/stringSupport.cpp
scummvm/trunk/engines/cruise/stringSupport.h
scummvm/trunk/engines/cruise/vars.h
Modified: scummvm/trunk/engines/cruise/actor.cpp
===================================================================
--- scummvm/trunk/engines/cruise/actor.cpp 2007-04-27 15:21:01 UTC (rev 26609)
+++ scummvm/trunk/engines/cruise/actor.cpp 2007-04-27 15:35:28 UTC (rev 26610)
@@ -1077,4 +1077,4 @@
}
}
}
-} // End of namespace Cruise
\ No newline at end of file
+} // End of namespace Cruise
Modified: scummvm/trunk/engines/cruise/actor.h
===================================================================
--- scummvm/trunk/engines/cruise/actor.h 2007-04-27 15:21:01 UTC (rev 26609)
+++ scummvm/trunk/engines/cruise/actor.h 2007-04-27 15:35:28 UTC (rev 26610)
@@ -33,7 +33,7 @@
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 getPixel(int x, int y);
} // End of namespace Cruise
-#endif
\ No newline at end of file
+#endif
Modified: scummvm/trunk/engines/cruise/ctp.h
===================================================================
--- scummvm/trunk/engines/cruise/ctp.h 2007-04-27 15:21:01 UTC (rev 26609)
+++ scummvm/trunk/engines/cruise/ctp.h 2007-04-27 15:35:28 UTC (rev 26610)
@@ -61,4 +61,4 @@
} // End of namespace Cruise
-#endif
\ No newline at end of file
+#endif
Modified: scummvm/trunk/engines/cruise/dataLoader.cpp
===================================================================
--- scummvm/trunk/engines/cruise/dataLoader.cpp 2007-04-27 15:21:01 UTC (rev 26609)
+++ scummvm/trunk/engines/cruise/dataLoader.cpp 2007-04-27 15:35:28 UTC (rev 26610)
@@ -34,7 +34,7 @@
type_UNK,
type_SPL,
type_SET,
- type_FNT,
+ type_FNT
};
typedef enum fileTypeEnum fileTypeEnum;
Modified: scummvm/trunk/engines/cruise/dataLoader.h
===================================================================
--- scummvm/trunk/engines/cruise/dataLoader.h 2007-04-27 15:21:01 UTC (rev 26609)
+++ scummvm/trunk/engines/cruise/dataLoader.h 2007-04-27 15:35:28 UTC (rev 26610)
@@ -35,4 +35,4 @@
} // End of namespace Cruise
-#endif
\ No newline at end of file
+#endif
Modified: scummvm/trunk/engines/cruise/font.cpp
===================================================================
--- scummvm/trunk/engines/cruise/font.cpp 2007-04-27 15:21:01 UTC (rev 26609)
+++ scummvm/trunk/engines/cruise/font.cpp 2007-04-27 15:35:28 UTC (rev 26610)
@@ -121,7 +121,7 @@
}
}
-void loadFNT(void* fileNameChar)
+void loadFNT(const void* fileNameChar)
{
uint8 header[6];
int32 fontSize;
Modified: scummvm/trunk/engines/cruise/font.h
===================================================================
--- scummvm/trunk/engines/cruise/font.h 2007-04-27 15:21:01 UTC (rev 26609)
+++ scummvm/trunk/engines/cruise/font.h 2007-04-27 15:35:28 UTC (rev 26610)
@@ -27,7 +27,7 @@
namespace Cruise {
-void loadFNT(void* fileName);
+void loadFNT(const void* fileName);
void loadSystemFont(void);
//////////////////////////////////////////////////
@@ -46,4 +46,4 @@
} // End of namespace Cruise
-#endif
\ No newline at end of file
+#endif
Modified: scummvm/trunk/engines/cruise/object.h
===================================================================
--- scummvm/trunk/engines/cruise/object.h 2007-04-27 15:21:01 UTC (rev 26609)
+++ scummvm/trunk/engines/cruise/object.h 2007-04-27 15:35:28 UTC (rev 26610)
@@ -91,4 +91,4 @@
} // End of namespace Cruise
-#endif
\ No newline at end of file
+#endif
Modified: scummvm/trunk/engines/cruise/perso.h
===================================================================
--- scummvm/trunk/engines/cruise/perso.h 2007-04-27 15:21:01 UTC (rev 26609)
+++ scummvm/trunk/engines/cruise/perso.h 2007-04-27 15:35:28 UTC (rev 26610)
@@ -53,4 +53,4 @@
} // End of namespace Cruise
-#endif
\ No newline at end of file
+#endif
Modified: scummvm/trunk/engines/cruise/stringSupport.cpp
===================================================================
--- scummvm/trunk/engines/cruise/stringSupport.cpp 2007-04-27 15:21:01 UTC (rev 26609)
+++ scummvm/trunk/engines/cruise/stringSupport.cpp 2007-04-27 15:35:28 UTC (rev 26610)
@@ -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
Modified: scummvm/trunk/engines/cruise/stringSupport.h
===================================================================
--- scummvm/trunk/engines/cruise/stringSupport.h 2007-04-27 15:21:01 UTC (rev 26609)
+++ scummvm/trunk/engines/cruise/stringSupport.h 2007-04-27 15:35:28 UTC (rev 26610)
@@ -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
Modified: scummvm/trunk/engines/cruise/vars.h
===================================================================
--- scummvm/trunk/engines/cruise/vars.h 2007-04-27 15:21:01 UTC (rev 26609)
+++ scummvm/trunk/engines/cruise/vars.h 2007-04-27 15:35:28 UTC (rev 26610)
@@ -337,4 +337,4 @@
} // End of namespace Cruise
-#endif
\ No newline at end of file
+#endif
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