Added (blank) binary file reading utils

CMakeLists.txt

@@ -36,9 +36,6 @@ if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
     set (WARNINGS "${WARNINGS} -Wno-padded -Wno-packed")
     set (WARNINGS "${WARNINGS} -Wno-global-constructors -Wno-exit-time-destructors")
     set (WARNINGS "${WARNINGS} -Wno-documentation-unknown-command -Wno-c++98-compat-pedantic")
-
-    set (WARNINGS "${WARNINGS} -Wno-sign-conversion")
-
     set (OpenRaider_CXX_FLAGS "${OpenRaider_CXX_FLAGS} -std=c++11")
     set (OpenRaider_CXX_FLAGS_DEBUG "${OpenRaider_CXX_FLAGS_DEBUG} -g -O0 -ftrapv")
     set (OpenRaider_CXX_FLAGS_RELEASE "${OpenRaider_CXX_FLAGS_RELEASE} -O2 -fomit-frame-pointer")

README.md

@@ -1,5 +1,7 @@
 # OpenRaider
 
+[![Build Status](https://travis-ci.org/xythobuz/OpenRaider.svg?branch=master)](https://travis-ci.org/xythobuz/OpenRaider)
+
 This is a fork of the [OpenRaider](http://openraider.sourceforge.net) Open Source implementation of the classic Tomb Raider Game Engine. The original project was abandoned in 2003.
 
 This fork aims to get OpenRaider in a more usable state, maybe one day even being able to play the old Tomb Raider games flawlessly...
@@ -8,8 +10,6 @@ If you just want to see OpenRaider doing something on your Mac, without installi
 
 It seems as if OpenRaider will currently only work on Little-Endian platforms. This is not nice and will hopefully be fixed in the future!
 
-[![Build Status](https://travis-ci.org/xythobuz/OpenRaider.svg?branch=master)](https://travis-ci.org/xythobuz/OpenRaider)
-
 [![Flattr this git repo](http://api.flattr.com/button/flattr-badge-large.png)](https://flattr.com/submit/auto?user_id=xythobuz&url=https://github.com/xythobuz/OpenRaider&title=OpenRaider&language=&tags=github&category=software)
 
 ## Configuration
@@ -30,14 +30,14 @@ A more or less recent [Doxygen documentation](http://xythobuz.github.io/OpenRaid
 
 Basically, OpenRaider depends on the following:
 
+* C++11 compiler
+* cmake
 * OpenGL
+* zlib
 * SDL2
 * SDL2-TTF (optional, needed if you want to use TTF fonts)
-* OpenAL & ALUT
-* zlib
-* cmake as build system
+* OpenAL & ALUT (optional, needed for sound output)
 * libpng (optional)
-* C++11 compiler
 
 On Mac OS X 10.9 with [XCode](https://developer.apple.com/xcode/) and [MacPorts](http://www.macports.org) installed, the following should be enough to get all dependencies that are available as port:
 
@@ -57,7 +57,7 @@ Get, compile and install freealut like this:
 
 Linux Distributions will probably provide an ALUT library ready to install with their package manager, so you won't need to compile freealut.
 
-Sound support is optional now, however. If cmake can’t find OpenAL and ALUT, Audio will be deactivated. If you want to explicitly deactivate it, call cmake with `-DENABLE_AUDIO=NO`.
+Sound support is optional, however. If cmake can’t find OpenAL and ALUT, Audio will be deactivated. If you want to explicitly deactivate it, call cmake with `-DENABLE_AUDIO=NO`.
 
 ## Building
 
@@ -142,7 +142,7 @@ I’ve made [a small writeup on my website](http://xythobuz.de/2014_06_14_trle_f
 
 ## License
 
-OpenRaider is based on code, specs, and alogrithms from:
+OpenRaider is based on code, specs, and algorithms from:
 
 * GooseEgg/Freyja 3d Modelers by Mongoose
 * TR Rosetta Stone spec sheet by Anonymous

TODO.md

@@ -2,21 +2,16 @@
 
 ## General
 
+* Move to newer OpenGL (GLES or 3.x or 4.x?)
 * Endian dependence ugly, shouldn't dereference to different types?
     * TombRaider.h/cpp structs aren't aligned... unportable to some big endian & other archs?!
     * Maybe replace loader with [VT](http://icculus.org/vt/), also used by OpenTomb.
-* Use more asserts
 * Don't use C-Style code, try to replace with C++ lib
     * Use std::strings
     * Rewrite Console and use operator << to write to the console?
-* SDL_TTF 2.0.12+ [can do line breaks](http://stackoverflow.com/questions/17847818/how-to-do-line-breaks-and-line-wrapping-with-sdl-ttf/18418688#18418688), use it
 * Mesh has 2 different approaches of storing the same data (eg. mColors and mColorArray), but half of ‘em isn’t implemented. Unify this, probably even combining Mesh and StaticMesh...
 * Don’t use float everywhere just because (eg. float colors)
 
-## Changes
-
-* Using std::vector with [] is not bound checked. Segfaults were caused because the upper bound of the argument was never checked and garbage was returned... Do consistent checks, or use .at() as it throws an exception
-
 ## Cmake
 
 * Support SSE with other compilers than Clang (src/CMakeLists.txt)

include/utils/binary.h

@@ -0,0 +1,30 @@
+/*!
+ * \file include/utils/binary.h
+ * \brief Binary file reading utilities
+ *
+ * \author xythobuz
+ */
+
+#ifndef _UTILS_BINARY_H_
+#define _UTILS_BINARY_H_
+
+void binOpen(const char *file);
+void binClose();
+
+unsigned long binTell();
+void binSeek(unsigned long pos);
+
+int8_t binRead8();
+uint8_t binReadU8();
+
+int16_t binRead16();
+uint16_t binReadU16();
+
+int32_t binRead32();
+uint32_t binReadU32();
+
+int64_t binRead64();
+uint64_t binReadU64();
+
+#endif
+

src/Menu.cpp

@@ -31,7 +31,7 @@ Menu::Menu() {
     mCursor = 0;
     mMin = 0;
 
-    mainText.text = bufferString(VERSION);
+    mainText.text = bufferString("%s", VERSION);
     mainText.color[0] = BLUE[0];
     mainText.color[1] = BLUE[1];
     mainText.color[2] = BLUE[2];

src/TombRaider.cpp

@@ -3334,7 +3334,7 @@ void TombRaider::getRoomTriangle(unsigned int roomIndex,
                 {
                     k = triangleIndex - count;
 
-                    *texture = *flags = 0; // FIXME
+                    *texture = *flags = 0; //! \fixme
 
                     // Setup per vertex
                     for (j = 0; j < 3; ++j)
@@ -3342,7 +3342,7 @@ void TombRaider::getRoomTriangle(unsigned int roomIndex,
                         // Get vertex index {(0, a), (1, b), (2, c) }
                         indices[j] = mRoomsTR5[roomIndex].faces[i].tris[k].vertices[j];
 
-                        // FIXME
+                        //! \fixme
                         //tIndex = mRoomsTR5[roomIndex].faces[i].vertices[j].texture & 0xff;
                         //computeUV(objectTexturesTR5[tIndex].vertices + i,
                         //          texCoords+i*2, texCoords+i*2+1);

src/utils/CMakeLists.txt

@@ -1,4 +1,5 @@
 # Source files
+set (UTIL_SRCS ${UTIL_SRCS} "binary.cpp")
 set (UTIL_SRCS ${UTIL_SRCS} "pcx.cpp")
 set (UTIL_SRCS ${UTIL_SRCS} "pixel.cpp")
 set (UTIL_SRCS ${UTIL_SRCS} "strings.cpp")

src/utils/binary.cpp

@@ -0,0 +1,58 @@
+/*!
+ * \file src/utils/binary.cpp
+ * \brief Binary file reading utilities
+ *
+ * \author xythobuz
+ */
+
+#include "global.h"
+#include "utils/binary.h"
+
+void binOpen(const char *file) {
+
+}
+
+void binClose() {
+
+}
+
+unsigned long binTell() {
+    return 0;
+}
+
+void binSeek(unsigned long pos) {
+
+}
+
+int8_t binRead8() {
+    return 0;
+}
+
+uint8_t binReadU8() {
+    return 0;
+}
+
+int16_t binRead16() {
+    return 0;
+}
+
+uint16_t binReadU16() {
+    return 0;
+}
+
+int32_t binRead32() {
+    return 0;
+}
+
+uint32_t binReadU32() {
+    return 0;
+}
+
+int64_t binRead64() {
+    return 0;
+}
+
+uint64_t binReadU64() {
+    return 0;
+}
+