diff options
Diffstat (limited to 'src/main.h')
| -rw-r--r-- | src/main.h | 48 |
1 files changed, 32 insertions, 16 deletions
@@ -1,26 +1,26 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * any later version. * - * The Mana World is distributed in the hope that it will be useful, + * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with The Mana World; if not, write to the Free Software + * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _TMW_MAIN_H -#define _TMW_MAIN_H +#ifndef MAIN_H +#define MAIN_H /** * \mainpage @@ -57,28 +57,33 @@ #include "../config.h" #elif defined WIN32 #include "winver.h" +#elif defined __APPLE__ +#define PACKAGE_VERSION "0.1.0" #endif -#ifndef TMW_DATADIR -#define TMW_DATADIR "" +#ifndef PKG_DATADIR +#define PKG_DATADIR "" #endif /* * Client different States */ enum { - STATE_CHOOSE_SERVER, - STATE_CONNECT_ACCOUNT, - STATE_UPDATE, + STATE_EXIT, STATE_LOADDATA, STATE_LOGIN, + STATE_REGISTER, + STATE_CHAR_SELECT, + STATE_GAME, + STATE_ERROR, + STATE_UPDATE, +#ifdef TMWSERV_SUPPORT + STATE_CHOOSE_SERVER, + STATE_CONNECT_ACCOUNT, STATE_LOGIN_ATTEMPT, STATE_LOGIN_ERROR, - STATE_REGISTER, STATE_REGISTER_ATTEMPT, STATE_ACCOUNTCHANGE_ERROR, - STATE_ERROR, - STATE_CHAR_SELECT, STATE_CHANGEEMAIL_ATTEMPT, STATE_CHANGEEMAIL, STATE_CHANGEPASSWORD_ATTEMPT, @@ -91,10 +96,16 @@ enum { STATE_SWITCH_ACCOUNTSERVER, STATE_LOGOUT_ATTEMPT, STATE_CONNECT_GAME, - STATE_GAME, STATE_WAIT, - STATE_EXIT, STATE_FORCE_QUIT +#else + STATE_ACCOUNT, + STATE_CHAR_CONNECT, + STATE_CHAR_SERVER, + STATE_CHAR_NEW, + STATE_CHAR_DEL, + STATE_CONNECTING +#endif }; /* length definitions for several char[]s in order @@ -120,7 +131,12 @@ const short defaultMusicVolume = 60; // Defines the number of usable player slots const short maxSlot = 2; +#ifdef TMWSERV_SUPPORT extern std::string token; +#else +extern char n_server, n_character; +#endif + extern unsigned char state; extern std::string errorMessage; |