ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed compilation on linux.

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@10899 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
hikerstk 2012-02-27 12:16:25 +00:00
parent f190652fb0
commit 1a7dde88d1
2 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/replay/replay.cpp
View File

@ -18,7 +18,6 @@
#include "replay/replay.hpp"
#include <stdio.h>
#include "io/file_manager.hpp"
#include "modes/world.hpp"
@ -29,6 +28,9 @@
#include "tracks/track.hpp"
#include "utils/constants.hpp"
#include <stdio.h>
#include <string>
bool Replay::m_do_replay = false;
Replay *Replay::m_replay = NULL;
@ -211,7 +213,7 @@ void Replay::Load()
fd = fopen(filename.c_str(), "r");
if(!fd)
{
printf("Can't read '%', ghost replay disabled.\n",
printf("Can't read '%s', ghost replay disabled.\n",
filename.c_str());
m_do_replay = false;
initRecording();
@ -320,7 +322,7 @@ void Replay::Load()
// Check for EV_TRANSFORM event:
// -----------------------------
if(sscanf(s, "0 %f %d %f %f %f %f %f %f %f %f\n",
if(sscanf(s, "0 %f %d %f %f %f %f %f %f %f\n",
&time, &kart_id,
&x, &y, &z,
&rx, &ry, &rz, &rw

11
src/replay/replay.hpp
View File

@ -22,6 +22,7 @@
#include "LinearMath/btTransform.h"
#include "utils/no_copy.hpp"
#include <string>
#include <vector>
class GhostKart;
@ -39,16 +40,8 @@ private:
/** Time at which this event happens. */
float m_time;
enum {EV_TRANSFORM, EV_NONE} m_type;
union
{
struct
{
struct {
btTransform m_t;
};
struct
{
int m_int_test; int a; int b;
};
} m_event; // union
}; // ReplayEvent
// ------------------------------------------------------------------------