[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Adonthell-commits] CVS: adonthell/src game.cc,1.27,1.28 item_base.h,1.
From: |
Kai Sterker <address@hidden> |
Subject: |
[Adonthell-commits] CVS: adonthell/src game.cc,1.27,1.28 item_base.h,1.8,1.9 main.cc,1.57,1.58 prefs.cc,1.31,1.32 |
Date: |
Thu, 20 Feb 2003 12:27:44 -0500 |
Update of /cvsroot/adonthell/adonthell/src
In directory subversions:/tmp/cvs-serv13901/src
Modified Files:
game.cc item_base.h main.cc prefs.cc
Log Message:
ADDED non-unix-install feature
FIXES for MacOS X (official binary release coming soon!)
Index: game.cc
===================================================================
RCS file: /cvsroot/adonthell/adonthell/src/game.cc,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -r1.27 -r1.28
*** game.cc 27 Apr 2002 17:00:19 -0000 1.27
--- game.cc 20 Feb 2003 17:27:41 -0000 1.28
***************
*** 39,43 ****
{
Global_data_dir = game_dir;
! #ifndef WIN32
User_data_dir = getenv ("HOME");
User_data_dir += "/.adonthell";
--- 39,43 ----
{
Global_data_dir = game_dir;
! #ifndef SINGLE_DIR_INST
User_data_dir = getenv ("HOME");
User_data_dir += "/.adonthell";
Index: item_base.h
===================================================================
RCS file: /cvsroot/adonthell/adonthell/src/item_base.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** item_base.h 17 Feb 2003 19:31:21 -0000 1.8
--- item_base.h 20 Feb 2003 17:27:41 -0000 1.9
***************
*** 356,360 ****
//@{
friend u_int32 slot::add (item_base * item, const u_int32 & count = 1);
! friend bool slot::remove (item_base * item, const u_int32 & count = 1);
/**
--- 356,360 ----
//@{
friend u_int32 slot::add (item_base * item, const u_int32 & count = 1);
! friend u_int32 slot::remove (item_base * item, const u_int32 & count = 1);
/**
Index: main.cc
===================================================================
RCS file: /cvsroot/adonthell/adonthell/src/main.cc,v
retrieving revision 1.57
retrieving revision 1.58
diff -C2 -r1.57 -r1.58
*** main.cc 12 Jan 2003 23:24:29 -0000 1.57
--- main.cc 20 Feb 2003 17:27:41 -0000 1.58
***************
*** 2,6 ****
$Id$
! Copyright (C) 1999/2000/2001/2002 Kai Sterker <address@hidden>
Part of the Adonthell Project http://adonthell.linuxgames.com
--- 2,6 ----
$Id$
! Copyright (C) 1999/2000/2001/2002/2003 Kai Sterker <address@hidden>
Part of the Adonthell Project http://adonthell.linuxgames.com
***************
*** 96,99 ****
--- 96,101 ----
int main(int argc, char * argv[])
{
+ config myconfig;
+
#ifdef MEMORY_LEAKS
// to debug memory leaks with mtrace. It's better to use
***************
*** 103,107 ****
// init game environment
! #if !defined (WIN32)
game::init (DATA_DIR);
#else
--- 105,109 ----
// init game environment
! #if !defined (SINGLE_DIR_INST)
game::init (DATA_DIR);
#else
***************
*** 116,119 ****
--- 118,125 ----
*(str + 1) = 0;
chdir (argv[0]);
+
+ // FIXME: this should go once we have our 'game launcher' gui
+ myconfig.gamedir = string (argv[0]) + "/games/wastesedge";
+
*(str + 1) = '/';
}
***************
*** 129,134 ****
game::init (buf);
#endif
-
- config myconfig;
// read the $HOME/.adonthell/adonthellrc file
--- 135,138 ----
Index: prefs.cc
===================================================================
RCS file: /cvsroot/adonthell/adonthell/src/prefs.cc,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -r1.31 -r1.32
*** prefs.cc 5 Jan 2003 23:00:15 -0000 1.31
--- prefs.cc 20 Feb 2003 17:27:41 -0000 1.32
***************
*** 37,41 ****
{
// set some default values where possible
! #ifdef WIN32
screen_mode = 1; // Fullscreen
#else
--- 37,41 ----
{
// set some default values where possible
! #if defined (WIN32) || defined (__APPLE__)
screen_mode = 1; // Fullscreen
#else
***************
*** 55,59 ****
// set the path to the adonthellrc file:
! #ifndef WIN32
adonthellrc = string (getenv ("HOME")) + "/.adonthell";
#else
--- 55,59 ----
// set the path to the adonthellrc file:
! #ifndef SINGLE_DIR_INST
adonthellrc = string (getenv ("HOME")) + "/.adonthell";
#else
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Adonthell-commits] CVS: adonthell/src game.cc,1.27,1.28 item_base.h,1.8,1.9 main.cc,1.57,1.58 prefs.cc,1.31,1.32,
Kai Sterker <address@hidden> <=
- Prev by Date:
[Adonthell-commits] CVS: adonthell/src dialog.cc,1.33,1.34 inventory.cc,1.5,1.6 inventory.h,1.9,1.10 item_base.cc,1.7,1.8 item_base.h,1.7,1.8 item_storage.cc,1.2,1.3 item_storage.h,1.1,1.2 mapcharacter.cc,1.48,1.49 py_object.h,1.11,1.12 slot.cc,1.3,1.4
- Next by Date:
[Adonthell-commits] CVS: wastesedge/osx Copying.html,NONE,1.1 Playing.html,NONE,1.1 ReadMe.html,NONE,1.1
- Previous by thread:
[Adonthell-commits] CVS: adonthell/src dialog.cc,1.33,1.34 inventory.cc,1.5,1.6 inventory.h,1.9,1.10 item_base.cc,1.7,1.8 item_base.h,1.7,1.8 item_storage.cc,1.2,1.3 item_storage.h,1.1,1.2 mapcharacter.cc,1.48,1.49 py_object.h,1.11,1.12 slot.cc,1.3,1.4
- Next by thread:
[Adonthell-commits] CVS: wastesedge/osx Copying.html,NONE,1.1 Playing.html,NONE,1.1 ReadMe.html,NONE,1.1
- Index(es):