Skip to content
Permalink
Browse files

Win32 build fixes

git-svn-id: svn+ssh://c99.org/home/c99org/svn/DCSquares/trunk@151 8944af1b-4df6-0310-90e0-d6e02aab4a67
  • Loading branch information...
c99koder committed Mar 31, 2006
1 parent 33fcb48 commit 0cb5485bb06fff3814909e0534900885635e1a44
@@ -19,6 +19,7 @@
class DCSMenu : public GenericMenu {
public:
DCSMenu(bool game);
~DCSMenu();
void init();
void FadeIn();
void FadeOut();
@@ -17,8 +17,9 @@

class GamePlay : public DCSMenu {
public:
void init();
GamePlay();
~GamePlay() {};
void init();
void controlPerFrame();

protected:
@@ -33,14 +33,14 @@ extern "C" {
#endif

playField::playField(bool game) {
destroy_list();
init_genrand(Time::gettime()*1000);

m_game = game;
if(game) m_countdown = 1.5f; else m_countdown=0;
}

playField::~playField() {
destroy_list();
};

void playField::draw(ObjType list) {
@@ -13,9 +13,11 @@
#include <Tiki/gl.h>
#include <Tiki/hid.h>
#include <Tiki/texture.h>
#include <Tiki/oggvorbis.h>

using namespace Tiki;
using namespace Tiki::GL;
using namespace Tiki::Audio;

#ifdef DREAMCAST
#include <oggvorbis/sndoggvorbis.h>
@@ -48,14 +50,14 @@ using namespace Tiki::GL;
using namespace Tiki::GL::Plxcompat;
using namespace Tiki::Hid;

#include "TitleScreen.h"
#include "GamePlay.h"
#include "LevelStats.h"
#include "HighScores.h"
#include "NameEntry.h"
#include "MultiPlaySetup.h"
#include "HowToPlay.h"
#include "NetworkLobby.h"
#include "menus/TitleScreen.h"
#include "menus/GamePlay.h"
#include "menus/LevelStats.h"
#include "menus/HighScores.h"
#include "menus/NameEntry.h"
#include "menus/MultiPlaySetup.h"
#include "menus/HowToPlay.h"
#include "menus/NetworkLobby.h"

extern float game_gt;
extern char highcode[];
@@ -136,6 +138,7 @@ extern "C" int tiki_main(int argc, char **argv) {
HighScores *hs;
MultiPlaySetup *mps;
HowToPlay *hp;
VorbisStream bgm;

// Init Tiki
Tiki::init(argc, argv);
@@ -144,15 +147,15 @@ extern "C" int tiki_main(int argc, char **argv) {
Hid::callbackReg(tkCallback, NULL);

#if TIKI_PLAT==TIKI_WIN32 //init winsock
WORD sockVersion;
WSADATA wsaData;
int nret;
//WORD sockVersion;
//WSADATA wsaData;
//int nret;

sockVersion = MAKEWORD(1, 1); // We'd like Winsock version 1.1
//sockVersion = MAKEWORD(1, 1); // We'd like Winsock version 1.1


// We begin by initializing Winsock
WSAStartup(sockVersion, &wsaData);
//WSAStartup(sockVersion, &wsaData);
#endif

#ifdef DREAMCAST
@@ -193,6 +196,9 @@ extern "C" int tiki_main(int argc, char **argv) {
sndoggvorbis_start(theme_dir("title.ogg"),1);
#endif
while(!quitting) {
bgm.stop();
bgm.load(theme_dir("title.ogg"),1);
bgm.start();
ts=new TitleScreen();
ts->FadeIn();
ts->doMenu();
@@ -15,9 +15,9 @@
using namespace Tiki;
using namespace Tiki::GL;

#include "menus/DCSMenu.h"
#include "squares.h"
#include "level.h"
#include "DCSMenu.h"

extern int scoreval;
extern float tickval;
@@ -45,8 +45,10 @@ DCSMenu::DCSMenu(bool game) {
init();
}

DCSMenu::~DCSMenu() {
}

void DCSMenu::init() {
destroy_list();
tickval=current_level->tickval; //1.0
speedval=current_level->speedval; //1.2
scoreval=current_level->scoreval; //100
@@ -16,7 +16,7 @@
using namespace Tiki;
using namespace Tiki::GL;

#include "HighScores.h"
#include "menus/HighScores.h"
#include "squares.h"
#include "score.h"
#include "theme.h"
@@ -14,7 +14,7 @@
using namespace Tiki;
using namespace Tiki::GL;

#include "LevelStats.h"
#include "menus/LevelStats.h"

LevelStats::LevelStats() : DCSMenu(false) {
hud=new squaresHUD(2);
@@ -19,7 +19,7 @@
using namespace Tiki;
using namespace Tiki::GL;

#include "MultiPlaySetup.h"
#include "menus/MultiPlaySetup.h"
#include "drawables/squaresHUD.h"
#include "level.h"
#include "squares.h"
@@ -14,7 +14,7 @@
using namespace Tiki;
using namespace Tiki::GL;

#include "NameEntry.h"
#include "menus/NameEntry.h"

#include "squares.h"
#include "theme.h"
@@ -20,12 +20,12 @@ using namespace Tiki::GL;

#include "drawables/box.h"

#include "NetworkLobby.h"
#include "menus/NetworkLobby.h"
#include "squarenet.h"
#include "net.h"

extern Texture *bg_tex;
extern Texture *game_tex;
extern RefPtr<Texture> bg_tex;
extern RefPtr<Texture> game_tex;
extern RefPtr<Font> fnt;
extern std::list<std::string> userlist;

@@ -18,7 +18,7 @@
using namespace Tiki;
using namespace Tiki::GL;

#include "TitleScreen.h"
#include "menus/TitleScreen.h"
#include "drawables/squaresHUD.h"
#include "level.h"
#include "squares.h"
BIN +9 KB (200%) win32/DCSquares.suo
Binary file not shown.

0 comments on commit 0cb5485

Please sign in to comment.
You can’t perform that action at this time.