Linux fixes.

This commit is contained in:
leo
2012-04-11 23:32:38 +00:00
parent fa1b2066e3
commit 067838dfd8
7 changed files with 15 additions and 10 deletions
+2 -2
View File
@@ -317,8 +317,8 @@ bool Camera::FileLoad(lcFile& file)
ChangeKey (step, false, true, f, LC_CK_UP);
ChangeKey (step, true, true, f, LC_CK_UP);
lcint32 snapshot = file.ReadS32();
lcint32 cam = file.ReadS32();
file.ReadS32(); // snapshot
file.ReadS32(); // cam
}
}
+1 -1
View File
@@ -288,7 +288,7 @@ void LoadColorFile(lcFile& File)
}
// Check if the new color is valid.
if (Color.Code == -1 || Color.Value[0] == FLT_MAX)
if (Color.Code == (lcuint32)-1 || Color.Value[0] == FLT_MAX)
continue;
if (Color.Edge[0] == FLT_MAX)
+2
View File
@@ -1,6 +1,8 @@
#ifndef _LC_COLORS_H_
#define _LC_COLORS_H_
#include "opengl.h"
#define LC_MAX_COLOR_NAME 64
struct lcColor
+1 -1
View File
@@ -1,4 +1,4 @@
SRC += common/algebra.cpp common/camera.cpp common/console.cpp common/curve.cpp common/lc_file.cpp \
SRC += common/algebra.cpp common/camera.cpp common/console.cpp common/curve.cpp common/lc_colors.cpp common/lc_file.cpp \
common/globals.cpp common/group.cpp common/image.cpp common/im_bmp.cpp common/im_gif.cpp \
common/lc_application.cpp common/library.cpp common/light.cpp common/mainwnd.cpp \
common/matrix.cpp common/message.cpp common/minifig.cpp common/object.cpp common/opengl.cpp \
+6 -6
View File
@@ -1925,9 +1925,9 @@ void PieceInfo::WriteWavefront(FILE* file, unsigned char color, unsigned long* s
for (count = *info, info++; count; count -= 3)
{
int idx1 = info[0] + *start;
int idx2 = info[1] + *start;
int idx3 = info[2] + *start;
long int idx1 = info[0] + *start;
long int idx2 = info[1] + *start;
long int idx3 = info[2] + *start;
if (idx1 != idx2 && idx1 != idx3 && idx2 != idx3)
fprintf(file, "f %ld %ld %ld\n", idx1, idx2, idx3);
@@ -1979,9 +1979,9 @@ void PieceInfo::WriteWavefront(FILE* file, unsigned char color, unsigned long* s
for (count = *info, info++; count; count -= 3)
{
int idx1 = info[0] + *start;
int idx2 = info[1] + *start;
int idx3 = info[2] + *start;
long int idx1 = info[0] + *start;
long int idx2 = info[1] + *start;
long int idx3 = info[2] + *start;
if (idx1 != idx2 && idx1 != idx3 && idx2 != idx3)
fprintf(file, "f %ld %ld %ld\n", idx1, idx2, idx3);
+1
View File
@@ -1,4 +1,5 @@
#include "lc_global.h"
#include <string.h>
#include "texfont.h"
static const unsigned char TextureData[2048] =
+2
View File
@@ -1,6 +1,8 @@
#ifndef _TEXFONT_H_
#define _TEXFONT_H_
#include "opengl.h"
class TexFont
{
public: