diff options
Diffstat (limited to 'engines/wintermute/utils')
-rw-r--r-- | engines/wintermute/utils/crc.cpp | 3 | ||||
-rw-r--r-- | engines/wintermute/utils/crc.h | 12 | ||||
-rw-r--r-- | engines/wintermute/utils/path_util.cpp | 2 |
3 files changed, 12 insertions, 5 deletions
diff --git a/engines/wintermute/utils/crc.cpp b/engines/wintermute/utils/crc.cpp index 933857e066..c127d08417 100644 --- a/engines/wintermute/utils/crc.cpp +++ b/engines/wintermute/utils/crc.cpp @@ -17,6 +17,7 @@ #include "engines/wintermute/utils/crc.h"
+namespace WinterMute {
/*
* Derive parameters from the standard-specific parameters in crc.h.
@@ -232,3 +233,5 @@ crc crc_process_byte(unsigned char byteVal, crc remainder) { crc crc_finalize(crc remainder) {
return (REFLECT_REMAINDER(remainder) ^ FINAL_XOR_VALUE);
}
+
+} // end of namespace WinterMute
diff --git a/engines/wintermute/utils/crc.h b/engines/wintermute/utils/crc.h index cf7ea1a00c..363340531d 100644 --- a/engines/wintermute/utils/crc.h +++ b/engines/wintermute/utils/crc.h @@ -16,6 +16,10 @@ #ifndef _crc_h
#define _crc_h
+#include "common/system.h" // For types.
+
+namespace WinterMute {
+
#ifndef TRUE
#define FALSE 0
#define TRUE !FALSE
@@ -26,10 +30,9 @@ */
#define CRC32
-
#if defined(CRC_CCITT)
-typedef unsigned short crc;
+typedef uint16 crc;
#define CRC_NAME "CRC-CCITT"
#define POLYNOMIAL 0x1021
@@ -41,7 +44,7 @@ typedef unsigned short crc; #elif defined(CRC16)
-typedef unsigned short crc;
+typedef uint16 crc;
#define CRC_NAME "CRC-16"
#define POLYNOMIAL 0x8005
@@ -53,7 +56,7 @@ typedef unsigned short crc; #elif defined(CRC32)
-typedef unsigned long crc;
+typedef uint32 crc;
#define CRC_NAME "CRC-32"
#define POLYNOMIAL 0x04C11DB7
@@ -77,5 +80,6 @@ extern "C" crc crc_initialize(void); extern "C" crc crc_process_byte(unsigned char byteVal, crc remainder);
extern "C" crc crc_finalize(crc remainder);
+} // End of namespace WinterMute
#endif /* _crc_h */
diff --git a/engines/wintermute/utils/path_util.cpp b/engines/wintermute/utils/path_util.cpp index 51f0f5817e..2fbe785a38 100644 --- a/engines/wintermute/utils/path_util.cpp +++ b/engines/wintermute/utils/path_util.cpp @@ -97,7 +97,7 @@ AnsiString PathUtil::getFileNameWithoutExtension(const AnsiString &path) { //size_t pos = fileName.find_last_of('.'); //TODO REMOVE!
// TODO: Prettify this.
AnsiString extension = Common::lastPathComponent(fileName, '.');
- for (int i = 0; i < extension.size() + 1; i++) {
+ for (uint32 i = 0; i < extension.size() + 1; i++) {
fileName.deleteLastChar();
}
// Common::String filename = Common::String(fileName.c_str(), fileName.size() - extension.size() + 1);
|