[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Enigma-cvs] enigma/src oxyd.cc,1.70,1.71
From: |
Ralf Westram <address@hidden> |
Subject: |
[Enigma-cvs] enigma/src oxyd.cc,1.70,1.71 |
Date: |
Mon, 27 Oct 2003 11:57:00 +0000 |
Update of /cvsroot/enigma/enigma/src
In directory subversions:/tmp/cvs-serv13480/src
Modified Files:
oxyd.cc
Log Message:
- removed unused member 'm_created' from oxyd levelpack classes
- fixed call to LevelInfo
Index: oxyd.cc
===================================================================
RCS file: /cvsroot/enigma/enigma/src/oxyd.cc,v
retrieving revision 1.70
retrieving revision 1.71
diff -C2 -d -r1.70 -r1.71
*** oxyd.cc 22 Oct 2003 21:38:08 -0000 1.70
--- oxyd.cc 27 Oct 2003 11:56:57 -0000 1.71
***************
*** 33,37 ****
#include "world.hh"
#include "display.hh"
- #include "system.hh"
#include "oxydlib/DatFile.h"
--- 33,36 ----
***************
*** 54,57 ****
--- 53,57 ----
using world::MakeItem;
using namespace OxydLib;
+ using namespace px;
static enigma::Direction
***************
*** 76,81 ****
class LevelPack_Oxyd : public LevelPack {
public:
! LevelPack_Oxyd (OxydVersion ver, DatFile *dat, time_t created,
! int idx_start, int idx_end, bool twoplayers);
virtual ~LevelPack_Oxyd() = 0; // class is interface!
--- 76,81 ----
class LevelPack_Oxyd : public LevelPack {
public:
! LevelPack_Oxyd (OxydVersion ver, DatFile *dat,
! int idx_start, int idx_end, bool twoplayers);
virtual ~LevelPack_Oxyd() = 0; // class is interface!
***************
*** 101,104 ****
--- 101,107 ----
protected:
+ virtual bool has_easymode(size_t /*index*/) const { return true; }
+ virtual int get_par_time(size_t /*index*/) const { return -1; }
+
/* Conversion tables from Oxyd bytecodes to Enigma object names. */
enigma_mapping::Mapping m_mapping;
***************
*** 125,129 ****
OxydVersion m_version;
DatFile *m_datfile; // just a reference (owned by GameInfo)
- time_t m_created; // creation date of datafile
Level *m_level; // Level currently being loaded
bool m_twoplayers; // true -> twoplayer game
--- 128,131 ----
***************
*** 135,142 ****
}
! LevelPack_Oxyd::LevelPack_Oxyd (OxydVersion ver, DatFile *dat, time_t created,
! int idx_start, int idx_end, bool twoplayers)
: m_mapping(ver), m_version(ver), m_datfile(dat),
! m_created(created), m_twoplayers(twoplayers),
m_index_start(idx_start)
{
--- 137,143 ----
}
! LevelPack_Oxyd::LevelPack_Oxyd (OxydVersion ver, DatFile *dat, int idx_start,
int idx_end, bool twoplayers)
: m_mapping(ver), m_version(ver), m_datfile(dat),
! m_twoplayers(twoplayers),
m_index_start(idx_start)
{
***************
*** 643,657 ****
LevelPack_Oxyd::get_info (size_t index) const
{
- static LevelInfo info ("oxyd", "Oxyd", "Dongleware", "1",
get_gametype()); // revision number must match get_revision_number
-
index = level_index[index]-m_index_start;
! char name[200];
! sprintf (name, "%s #%d", get_name().c_str(), index+1);
! info.name = name;
!
! char filename[200];
! sprintf (filename, "Import %s %d", get_name().c_str(), index);
! info.filename = filename;
return &info;
--- 644,655 ----
LevelPack_Oxyd::get_info (size_t index) const
{
index = level_index[index]-m_index_start;
! static LevelInfo info (get_gametype(),
! strf("Import %s %d", get_name().c_str(), index),
! strf("%s #%d", get_name().c_str(), index+1),
! "Dongleware",
! get_revision_number(index), has_easymode(index),
! get_par_time(index), -1, "", "");
return &info;
***************
*** 668,677 ****
Item *make_item (int type);
public:
! LP_Oxyd1 (DatFile *dat, time_t created, bool twoplayers);
};
}
! LP_Oxyd1::LP_Oxyd1 (DatFile *dat, time_t created, bool twoplayers)
! : LevelPack_Oxyd (OxydVersion_Oxyd1, dat, created,
twoplayers ? 100 : 0,
twoplayers ? 199 : 99,
--- 666,675 ----
Item *make_item (int type);
public:
! LP_Oxyd1 (DatFile *dat, bool twoplayers);
};
}
! LP_Oxyd1::LP_Oxyd1 (DatFile *dat, bool twoplayers)
! : LevelPack_Oxyd (OxydVersion_Oxyd1, dat,
twoplayers ? 100 : 0,
twoplayers ? 199 : 99,
***************
*** 718,727 ****
Item *make_item (int type);
public:
! LP_OxydExtra (DatFile *dat, time_t created);
};
}
! LP_OxydExtra::LP_OxydExtra (DatFile *dat, time_t created)
! : LevelPack_Oxyd (OxydVersion_OxydExtra, dat, created, 0, 99, false)
{
}
--- 716,725 ----
Item *make_item (int type);
public:
! LP_OxydExtra (DatFile *dat);
};
}
! LP_OxydExtra::LP_OxydExtra (DatFile *dat)
! : LevelPack_Oxyd (OxydVersion_OxydExtra, dat, 0, 99, false)
{
}
***************
*** 763,773 ****
Stone *make_stone (int type, int x, int y);
public:
! LP_PerOxyd (DatFile *dat, time_t created, bool twoplayers);
};
}
! LP_PerOxyd::LP_PerOxyd (DatFile *dat, time_t created, bool twoplayers)
! : LevelPack_Oxyd (OxydVersion_PerOxyd, dat, created,
twoplayers ? 100 : 0,
twoplayers ? 199 : 99,
--- 761,771 ----
Stone *make_stone (int type, int x, int y);
public:
! LP_PerOxyd (DatFile *dat, bool twoplayers);
};
}
! LP_PerOxyd::LP_PerOxyd (DatFile *dat, bool twoplayers)
! : LevelPack_Oxyd (OxydVersion_PerOxyd, dat,
twoplayers ? 100 : 0,
twoplayers ? 199 : 99,
***************
*** 807,817 ****
Stone *make_stone (int type, int x, int y);
public:
! LP_OxydMagnum(OxydVersion, DatFile *dat, time_t created);
};
}
! LP_OxydMagnum::LP_OxydMagnum(OxydVersion version, DatFile *dat, time_t
created)
! : LevelPack_Oxyd (version, dat, created, 0,
! (version==OxydVersion_OxydMagnumGold) ? 120 : 99, false)
{
}
--- 805,814 ----
Stone *make_stone (int type, int x, int y);
public:
! LP_OxydMagnum(OxydVersion, DatFile *dat);
};
}
! LP_OxydMagnum::LP_OxydMagnum(OxydVersion version, DatFile *dat)
! : LevelPack_Oxyd (version, dat, 0, (version==OxydVersion_OxydMagnumGold) ?
120 : 99, false)
{
}
***************
*** 856,860 ****
string datfile_path;
bool m_present;
- time_t modified; // !m_present -> 0
void openDatFile();
--- 853,856 ----
***************
*** 864,873 ****
GameInfo::GameInfo()
! : ver(OxydVersion_Invalid), datfile(0), m_present(false), modified(0)
{}
GameInfo::GameInfo (OxydVersion ver_, const string &game_, const string
&datfile_name_)
! : ver(ver_), game(game_), datfile(0), /*datfile_name(datfile_name_),
*/m_present(false), modified(0)
{
string fname;
--- 860,869 ----
GameInfo::GameInfo()
! : ver(OxydVersion_Invalid), datfile(0), m_present(false)
{}
GameInfo::GameInfo (OxydVersion ver_, const string &game_, const string
&datfile_name_)
! : ver(ver_), game(game_), datfile(0), /*datfile_name(datfile_name_),
*/m_present(false)
{
string fname;
***************
*** 894,898 ****
datfile = new DatFile;
- modified = sysdep::FileModTime(datfile_path);
string errmsg;
--- 890,893 ----
***************
*** 919,940 ****
switch (ver) {
case OxydVersion_Oxyd1:
! return new LP_Oxyd1 (datfile, modified, twoplayers);
case OxydVersion_OxydExtra:
! return new LP_OxydExtra(datfile, modified);
case OxydVersion_PerOxyd:
! return new LP_PerOxyd (datfile, modified, twoplayers);
case OxydVersion_OxydMagnum:
case OxydVersion_OxydMagnumGold:
! return new LP_OxydMagnum (ver, datfile, modified);
default:
assert(0);
break;
- // {
- // int firstlevel = twoplayers ? 100 : 0;
- // int lastlevel = twoplayers ? 199 : 99;
- // return new LevelPack_Oxyd(ver, datfile, modified,
firstlevel, lastlevel, twoplayers);
- // }
}
-
}
--- 914,929 ----
switch (ver) {
case OxydVersion_Oxyd1:
! return new LP_Oxyd1 (datfile, twoplayers);
case OxydVersion_OxydExtra:
! return new LP_OxydExtra(datfile);
case OxydVersion_PerOxyd:
! return new LP_PerOxyd (datfile, twoplayers);
case OxydVersion_OxydMagnum:
case OxydVersion_OxydMagnumGold:
! return new LP_OxydMagnum (ver, datfile);
default:
assert(0);
break;
}
}
***************
*** 979,983 ****
void enigma::oxyd::Shutdown()
{
! px::delete_sequence(games.begin(), games.end());
}
--- 968,972 ----
void enigma::oxyd::Shutdown()
{
! delete_sequence(games.begin(), games.end());
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Enigma-cvs] enigma/src oxyd.cc,1.70,1.71,
Ralf Westram <address@hidden> <=