timewarp-commit — Shows each and every CVS commit - high volume

[Timewarp-commit] include MASkinG.h,NONE,1.1 alfont.h,NONE,1.1 alfontdll.h,NONE,1.1

[Paul F. <you...@us...>]

Update of /cvsroot/timewarp/include
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4626/include

Added Files:
	MASkinG.h alfont.h alfontdll.h 
Log Message:
adding MASkinG GUI library; adding AlFont library; updating VC project file to use these sources

--- NEW FILE: alfont.h ---
/* AllegroFont - a wrapper for FreeType 2 */
/* to render TTF and other font formats with Allegro */

            
/* FreeType 2 is copyright (c) 1996-2000 */
/* David Turner, Robert Wilhelm, and Werner Lemberg */
/* AllegroFont is copyright (c) 2001, 2002 Javier Gonz lez */

/* See FTL.txt (FreeType Project License) for license */


#ifndef ALFONT_H
#define ALFONT_H


#include <allegro.h>

#include "alfontdll.h"


#ifdef __cplusplus
extern "C" {
#endif


/* common define */

#define ALFONT_MAJOR_VERSION        1
#define ALFONT_MINOR_VERSION        9
#define ALFONT_SUB_VERSION          1
#define ALFONT_VERSION_STR          "1.9.1"
#define ALFONT_DATE_STR             "24/11/2002"
#define ALFONT_DATE                 20021124    /* yyyymmdd */

/* error codes */

#define ALFONT_OK                   0
#define ALFONT_ERROR                -1


/* includes */

#include <allegro.h>


/* structs */
typedef struct ALFONT_FONT ALFONT_FONT;


/* API */

ALFONT_DLL_DECLSPEC int alfont_init(void);
ALFONT_DLL_DECLSPEC void alfont_exit(void);

ALFONT_DLL_DECLSPEC ALFONT_FONT *alfont_load_font(const char *filepathname);
ALFONT_DLL_DECLSPEC ALFONT_FONT *alfont_load_font_from_mem(const char *data, int data_len);
ALFONT_DLL_DECLSPEC void alfont_destroy_font(ALFONT_FONT *f);

ALFONT_DLL_DECLSPEC int alfont_set_font_size(ALFONT_FONT *f, int h);
ALFONT_DLL_DECLSPEC int alfont_get_font_height(ALFONT_FONT *f);

ALFONT_DLL_DECLSPEC int alfont_text_mode(int mode);

ALFONT_DLL_DECLSPEC void alfont_textout_aa(BITMAP *bmp, ALFONT_FONT *f, const char *s, int x, int y, int color);
ALFONT_DLL_DECLSPEC void alfont_textout(BITMAP *bmp, ALFONT_FONT *f, const char *s, int x, int y, int color);
ALFONT_DLL_DECLSPEC void alfont_textout_aa_ex(BITMAP *bmp, ALFONT_FONT *f, const char *s, int x, int y, int color, int bg);
ALFONT_DLL_DECLSPEC void alfont_textout_ex(BITMAP *bmp, ALFONT_FONT *f, const char *s, int x, int y, int color, int bg);

ALFONT_DLL_DECLSPEC void alfont_textout_centre_aa(BITMAP *bmp, ALFONT_FONT *f, const char *s, int x, int y, int color);
ALFONT_DLL_DECLSPEC void alfont_textout_centre(BITMAP *bmp, ALFONT_FONT *f, const char *s, int x, int y, int color);
ALFONT_DLL_DECLSPEC void alfont_textout_centre_aa_ex(BITMAP *bmp, ALFONT_FONT *f, const char *s, int x, int y, int color, int bg);
ALFONT_DLL_DECLSPEC void alfont_textout_centre_ex(BITMAP *bmp, ALFONT_FONT *f, const char *s, int x, int y, int color, int bg);

ALFONT_DLL_DECLSPEC void alfont_textout_right_aa(BITMAP *bmp, ALFONT_FONT *f, const char *s, int x, int y, int color);
ALFONT_DLL_DECLSPEC void alfont_textout_right(BITMAP *bmp, ALFONT_FONT *f, const char *s, int x, int y, int color);
ALFONT_DLL_DECLSPEC void alfont_textout_right_aa_ex(BITMAP *bmp, ALFONT_FONT *f, const char *s, int x, int y, int color, int bg);
ALFONT_DLL_DECLSPEC void alfont_textout_right_ex(BITMAP *bmp, ALFONT_FONT *f, const char *s, int x, int y, int color, int bg);

ALFONT_DLL_DECLSPEC void alfont_textprintf(BITMAP *bmp, ALFONT_FONT *f, int x, int y, int color, const char *format, ...);
ALFONT_DLL_DECLSPEC void alfont_textprintf_aa(BITMAP *bmp, ALFONT_FONT *f, int x, int y, int color, const char *format, ...);
ALFONT_DLL_DECLSPEC void alfont_textprintf_ex(BITMAP *bmp, ALFONT_FONT *f, int x, int y, int color, int bg, const char *format, ...);
ALFONT_DLL_DECLSPEC void alfont_textprintf_aa_ex(BITMAP *bmp, ALFONT_FONT *f, int x, int y, int color, int bg, const char *format, ...);

ALFONT_DLL_DECLSPEC void alfont_textprintf_centre(BITMAP *bmp, ALFONT_FONT *f, int x, int y, int color, const char *format, ...);
ALFONT_DLL_DECLSPEC void alfont_textprintf_centre_aa(BITMAP *bmp, ALFONT_FONT *f, int x, int y, int color, const char *format, ...);
ALFONT_DLL_DECLSPEC void alfont_textprintf_centre_ex(BITMAP *bmp, ALFONT_FONT *f, int x, int y, int color, int bg, const char *format, ...);
ALFONT_DLL_DECLSPEC void alfont_textprintf_centre_aa_ex(BITMAP *bmp, ALFONT_FONT *f, int x, int y, int color, int bg, const char *format, ...);

ALFONT_DLL_DECLSPEC void alfont_textprintf_right(BITMAP *bmp, ALFONT_FONT *f, int x, int y, int color, const char *format, ...);
ALFONT_DLL_DECLSPEC void alfont_textprintf_right_aa(BITMAP *bmp, ALFONT_FONT *f, int x, int y, int color, const char *format, ...);
ALFONT_DLL_DECLSPEC void alfont_textprintf_right_ex(BITMAP *bmp, ALFONT_FONT *f, int x, int y, int color, int bg, const char *format, ...);
ALFONT_DLL_DECLSPEC void alfont_textprintf_right_aa_ex(BITMAP *bmp, ALFONT_FONT *f, int x, int y, int color, int bg, const char *format, ...);

ALFONT_DLL_DECLSPEC int alfont_text_height(ALFONT_FONT *f);
ALFONT_DLL_DECLSPEC int alfont_text_length(ALFONT_FONT *f, const char *str);

ALFONT_DLL_DECLSPEC int alfont_is_fixed_font(ALFONT_FONT *f);
ALFONT_DLL_DECLSPEC int alfont_is_scalable_font(ALFONT_FONT *f);

ALFONT_DLL_DECLSPEC const int *alfont_get_available_fixed_sizes(ALFONT_FONT *f);
ALFONT_DLL_DECLSPEC int alfont_get_nof_available_fixed_sizes(ALFONT_FONT *f);

ALFONT_DLL_DECLSPEC int alfont_get_char_extra_spacing(ALFONT_FONT *f);
ALFONT_DLL_DECLSPEC void alfont_set_char_extra_spacing(ALFONT_FONT *f, int spacing);

#ifdef __cplusplus
}
#endif

#endif

--- NEW FILE: MASkinG.h ---
// ************************************************************************** //
//         MASkinG - Miran Amon's Skinnable GUI Library for Allegro           //
//    Copyright (c) 2002-2003 Miran Amon (mir...@us...)    //
//          Project websites: http://ferisrv5.uni-mb.si/~ma0747               //
//                  http://sourceforge.net/projects/masking                   //
// ************************************************************************** //

#ifndef			MASKING_H
#define			MASKING_H

#ifdef ALLEGRO_MSVC
#pragma warning (disable:4786,4788)
#endif

#include <alfont.h>

////////////////////////////////////////////////////////////////////////////////
// Version Info
////////////////////////////////////////////////////////////////////////////////

/**
	The major version number. For example 0 in v0.70.
*/
#define MASKING_VERSION			0
/**
	The minor version number. For example 70 in v0.70.
*/
#define MASKING_SUB_VERSION		76
/**
	The version string. For example "0.70" for v0.70.
*/
#define MASKING_VERSION_STR		"0.76b"
/**
	The release date. The format of the date is yyyymmdd. For example 20030806
	means August 6, 2003.
*/
#define MASKING_DATE			20040325

#include "MASkinG/defines.h"
#include "MASkinG/global.h"
#include "MASkinG/error.h"
#include "MASkinG/settings.h"
#include "MASkinG/color.h"
#include "MASkinG/point.h"
#include "MASkinG/size.h"
#include "MASkinG/rect.h"
#include "MASkinG/bitmap.h"
#include "MASkinG/sample.h"
#include "MASkinG/cursor.h"
#include "MASkinG/font.h"
#include "MASkinG/skin.h"
#include "MASkinG/screenupdate.h"
#include "MASkinG/doublebuffer.h"
#include "MASkinG/pageflipping.h"
#include "MASkinG/triplebuffer.h"
#include "MASkinG/drs.h"
#include "MASkinG/mouse.h"
#include "MASkinG/timer.h"
#include "MASkinG/widget.h"
#include "MASkinG/dialog.h"
#include "MASkinG/animator.h"
#include "MASkinG/clearscreen.h"
#include "MASkinG/label.h"
#include "MASkinG/fps.h"
#include "MASkinG/image.h"
#include "MASkinG/wallpaper.h"
#include "MASkinG/button.h"
#include "MASkinG/hypertext.h"
#include "MASkinG/checkbox.h"
#include "MASkinG/radiobutton.h"
#include "MASkinG/panel.h"
#include "MASkinG/groupbox.h"
#include "MASkinG/editbox.h"
#include "MASkinG/scrollobj.h"
#include "MASkinG/spinbox.h"
#include "MASkinG/separator.h"
#include "MASkinG/progress.h"
#include "MASkinG/slider.h"
#include "MASkinG/scroller.h"
#include "MASkinG/listbox.h"
#include "MASkinG/shortcut.h"
#include "MASkinG/combobox.h"
#include "MASkinG/window.h"
#include "MASkinG/menu.h"
#include "MASkinG/messagebox.h"
#include "MASkinG/fileselect.h"
#include "MASkinG/colorsel.h"
#include "MASkinG/scrollbox.h"
#include "MASkinG/textarea.h"
#include "MASkinG/tooltip.h"
#include "MASkinG/accelerator.h"
#include "MASkinG/tabpanel.h"
#include "MASkinG/splitter.h"
#include "MASkinG/gldriver.h"
#include "MASkinG/glviewport.h"
#include "MASkinG/gldialog.h"

#ifdef	MessageBox
#undef	MessageBox
#endif

#ifdef	SendMessage
#undef	SendMessage
#endif

#endif		//MASKING_H

--- NEW FILE: alfontdll.h ---
/* AllegroFont - a wrapper for FreeType 2 */
/* to render TTF and other font formats with Allegro */

            
/* FreeType 2 is copyright (c) 1996-2000 */
/* David Turner, Robert Wilhelm, and Werner Lemberg */
/* AllegroFont is copyright (c) 2001, 2002 Javier Gonz lez */

/* See FTL.txt (FreeType Project License) for license */


#ifndef ALFONT_DLL_DECLSPEC
#define ALFONT_DLL_DECLSPEC
/*#  ifdef ALFONT_DLL
#    ifdef ALFONT_DLL_EXPORTS
#      define ALFONT_DLL_DECLSPEC __declspec(dllexport)
#    else
#      define ALFONT_DLL_DECLSPEC __declspec(dllimport)
#    endif
#  else
#    define ALFONT_DLL_DECLSPEC
#  endif*/
#endif

[Timewarp-commit] include/MASkinG - New directory

[Paul F. <you...@us...>]

Update of /cvsroot/timewarp/include/MASkinG
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32522/MASkinG

Log Message:
Directory /cvsroot/timewarp/include/MASkinG added to the repository

[Timewarp-commit] source/alfont - New directory

[Paul F. <you...@us...>]

Update of /cvsroot/timewarp/source/alfont
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32485/alfont

Log Message:
Directory /cvsroot/timewarp/source/alfont added to the repository

[Timewarp-commit] source/masking - New directory

[Paul F. <you...@us...>]

Update of /cvsroot/timewarp/source/masking
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32369/masking

Log Message:
Directory /cvsroot/timewarp/source/masking added to the repository

[Timewarp-commit] code.txt,1.5,1.6

[? <or...@us...>]

Update of /cvsroot/timewarp
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22458

Modified Files:
	code.txt 
Log Message:
removed warning from code.txt about not declaring variables in for loops because of MSVC
(because that's been fixed via a hackish macro)

Index: code.txt
===================================================================
RCS file: /cvsroot/timewarp/code.txt,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** code.txt	29 Jan 2004 21:49:31 -0000	1.5
--- code.txt	30 Mar 2004 23:29:40 -0000	1.6
***************
*** 59,69 ****
  4.  All source files should have extensions of either .cpp or .h .  No .c or
  .cc files.  Exception: .c files are permitted in the util directory.  
- 5.  The following code is incorrect
- for (int i = 0; i < 100; i++) blah();
- instead, do this
- int i;
- for (i = 0; i < 100; i++) blah();
- Why?  Because Visual C and gcc will scope i in different ways in the first
- example, potentially causing issues when switching compilers.  
  
  Collisions:
--- 59,62 ----
***************
*** 118,122 ****
  recommended, but you can add your own events to that log.  Simply call
  debug_log() with printf-style parameters and your stuff will be added.
! The log is written to tw_sys.log.  The log is used very sparingly in TW, 
  primarily for initialization of IO stuff.  
  
--- 111,115 ----
  recommended, but you can add your own events to that log.  Simply call
  debug_log() with printf-style parameters and your stuff will be added.
! The log is written to tw_sys.log.  The log is used  sparingly in TW, 
  primarily for initialization of IO stuff.  
  
***************
*** 222,226 ****
  int ms = scale_frames(sc2_time);
  Warning: the conversion is non-linear and rather weird.
! Note: Many .ini files use milliseconds externally instead of SC2-time-units
  
  Angle: internally Radians, externally Degrees.
--- 215,219 ----
  int ms = scale_frames(sc2_time);
  Warning: the conversion is non-linear and rather weird.
! Note: Some .ini files use milliseconds externally instead of SC2-time-units
  
  Angle: internally Radians, externally Degrees.

[Timewarp-commit] twgui.dat,1.3,NONE twgui_solar.dat,1.1,NONE

[Rob <geo...@us...>]

Update of /cvsroot/timewarp
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19745

Removed Files:
	twgui.dat twgui_solar.dat 
Log Message:
outdated

--- twgui_solar.dat DELETED ---

--- twgui.dat DELETED ---

[Timewarp-commit] source scp.cpp,1.68,1.69

[Rob <geo...@us...>]

Update of /cvsroot/timewarp/source
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19490

Modified Files:
	scp.cpp 
Log Message:
no message

Index: scp.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/scp.cpp,v
retrieving revision 1.68
retrieving revision 1.69
diff -C2 -d -r1.68 -r1.69
*** scp.cpp	26 Mar 2004 16:54:36 -0000	1.68
--- scp.cpp	27 Mar 2004 18:48:45 -0000	1.69
***************
*** 18,22 ****
   */
  
! #define INCLUDE_GAMEX
  
  #include <stdlib.h>
--- 18,22 ----
   */
  
! //#define INCLUDE_GAMEX
  
  #include <stdlib.h>
***************
*** 156,168 ****
  DIALOG mainDialog[] = {
    // (dialog proc)     (x)   (y)   (w)   (h)   (fg)  (bg)  (key) (flags)  (d1)  (d2)  (dp)
!   { d_shadow_box_proc, 40,   40,   180,  215,  255,  0,    0,    0,       0,    0,    NULL, NULL, NULL },
    { my_d_button_proc,  45,   45,   170,  30,   255,  0,    0,    D_EXIT,  0,    0,    (void *)"Melee" , NULL, NULL },
!   { my_d_button_proc,  250,  45,   170,  30,   255,  0,    0,    D_EXIT,  0,    0,    (void *)"Join" , NULL, NULL }, //MAIN_DIALOG_NET_JOIN
!   { my_d_button_proc,  250,  80,   170,  30,   255,  0,    0,    D_EXIT,  0,    0,    (void *)"Host" , NULL, NULL }, //MAIN_DIALOG_NET_HOST
!   { my_d_button_proc,  45,   80,   170,  30,   255,  0,    0,    D_EXIT,  0,    0,    (void *)"Extended Menu" , NULL, NULL },
!   { my_d_button_proc,  45,   115,  170,  30,   255,  0,    0,    D_EXIT,  0,    0,    (void *)"Teams" , NULL, NULL },
!   { my_d_button_proc,  45,   150,  170,  30,   255,  0,    0,    D_EXIT,  0,    0,    (void *)"Options", NULL, NULL },
!   { my_d_button_proc,  45,   185,  170,  30,   255,  0,    0,    D_EXIT,  0,    0,    (void *)"Help", NULL, NULL },
!   { my_d_button_proc,  45,   220,  170,  30,   255,  0,    0,    D_EXIT,  0,    0,    (void *)"Exit", NULL, NULL },
  #ifdef INCLUDE_GAMEX
    { my_d_button_proc, 550,   440,   50,  30,   255,  0,    0,    D_EXIT | D_SPECIAL_BUTTON,
--- 156,168 ----
  DIALOG mainDialog[] = {
    // (dialog proc)     (x)   (y)   (w)   (h)   (fg)  (bg)  (key) (flags)  (d1)  (d2)  (dp)
!   { d_shadow_box_proc, 40,   40,   180,  285,  255,  0,    0,    0,       0,    0,    NULL, NULL, NULL },
    { my_d_button_proc,  45,   45,   170,  30,   255,  0,    0,    D_EXIT,  0,    0,    (void *)"Melee" , NULL, NULL },
!   { my_d_button_proc,  45,   80,   170,  30,   255,  0,    0,    D_EXIT,  0,    0,    (void *)"Join" , NULL, NULL }, //MAIN_DIALOG_NET_JOIN
!   { my_d_button_proc,  45,   115,  170,  30,   255,  0,    0,    D_EXIT,  0,    0,    (void *)"Host" , NULL, NULL }, //MAIN_DIALOG_NET_HOST
!   { my_d_button_proc,  45,   150,  170,  30,   255,  0,    0,    D_EXIT,  0,    0,    (void *)"Extended Menu" , NULL, NULL },
!   { my_d_button_proc,  45,   185,  170,  30,   255,  0,    0,    D_EXIT,  0,    0,    (void *)"Teams" , NULL, NULL },
!   { my_d_button_proc,  45,   220,  170,  30,   255,  0,    0,    D_EXIT,  0,    0,    (void *)"Options", NULL, NULL },
!   { my_d_button_proc,  45,   255,  170,  30,   255,  0,    0,    D_EXIT,  0,    0,    (void *)"Help", NULL, NULL },
!   { my_d_button_proc,  45,   290,  170,  30,   255,  0,    0,    D_EXIT,  0,    0,    (void *)"Exit", NULL, NULL },
  #ifdef INCLUDE_GAMEX
    { my_d_button_proc, 550,   440,   50,  30,   255,  0,    0,    D_EXIT | D_SPECIAL_BUTTON,

[Timewarp-commit] source/melee mship.cpp,1.30,1.31

[Rob <geo...@us...>]

Update of /cvsroot/timewarp/source/melee
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19490/melee

Modified Files:
	mship.cpp 
Log Message:
no message

Index: mship.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/melee/mship.cpp,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** mship.cpp	24 Mar 2004 23:51:38 -0000	1.30
--- mship.cpp	27 Mar 2004 18:48:45 -0000	1.31
***************
*** 554,559 ****
  	if (control) {
  
! 		// it makes most sense, to place this in FRONT of these commands here ...
! 		this->nextkeys = control->keys;
  
  		this->thrust           = 1&&(nextkeys & keyflag::thrust);
--- 554,561 ----
  	if (control) {
  
! 		// it makes most sense, to place this in FRONT of these commands here cause it'll give you 1 frame faster control
! 		// however, it'll be impossible to override the control of the ship in this way...
! 		//this->nextkeys = control->keys;
! 		// so .. I'll just put it back for now.
  
  		this->thrust           = 1&&(nextkeys & keyflag::thrust);
***************
*** 587,590 ****
--- 589,593 ----
          }
  
+ 		this->nextkeys = control->keys;
  
          

[Timewarp-commit] source/games gflmelee.cpp,1.26,1.27

[Rob <geo...@us...>]

Update of /cvsroot/timewarp/source/games
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3753/games

Modified Files:
	gflmelee.cpp 
Log Message:
flmelee fix

Index: gflmelee.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/games/gflmelee.cpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** gflmelee.cpp	24 Mar 2004 23:51:34 -0000	1.26
--- gflmelee.cpp	27 Mar 2004 11:35:53 -0000	1.27
***************
*** 351,355 ****
  void FlMelee::init(Log *_log)
  {
! 	STACKTRACE;;
  
  	// disable "bots", cause it's humans first, bots are the rest of the ships by default
--- 351,355 ----
  void FlMelee::init(Log *_log)
  {
! 	STACKTRACE;
  
  	// disable "bots", cause it's humans first, bots are the rest of the ships by default
***************
*** 378,385 ****
  
  	log_file("plhuge.ini");
! 	int Comets = get_config_int(NULL, "Comets",0);
  	int CoMass = get_config_int(NULL, "Comet_mass",0);
  	int ComMax = get_config_int(NULL, "Comet_max",0);
- 	int Asteroids=get_config_int(NULL,"Asteroids",0);
  	int ComAcc = get_config_int(NULL, "Comet_acc",0);
  
--- 378,384 ----
  
  	log_file("plhuge.ini");
! 
  	int CoMass = get_config_int(NULL, "Comet_mass",0);
  	int ComMax = get_config_int(NULL, "Comet_max",0);
  	int ComAcc = get_config_int(NULL, "Comet_acc",0);
  
***************
*** 392,399 ****
  	
  	//Make sure variables being read properly	
- 	iMessage("Comets    = %d",Comets);
  	iMessage("CoMass    = %d",CoMass);
  	iMessage("ComMax    = %d",ComMax);
- 	iMessage("Asteroids = %d",Asteroids);
  	iMessage("ComAcc    = %d",ComAcc);
  	iMessage("MapSize   = %d",MapSize);
--- 391,396 ----
***************
*** 433,437 ****
  		// copied from Planet::Planet :
  		// note that Planet constructor calls another log file.
! 		log_file("plhuge.ini");
  		Centre->gravity_mindist = scale_range(get_config_float("GPlanet", "GravityMinDist", 0));
  		Centre->gravity_range = scale_range(get_config_float("GPlanet", "GravityRange", 0));
--- 430,434 ----
  		// copied from Planet::Planet :
  		// note that Planet constructor calls another log file.
! 		//log_file("plhuge.ini");
  		Centre->gravity_mindist = scale_range(get_config_float("GPlanet", "GravityMinDist", 0));
  		Centre->gravity_range = scale_range(get_config_float("GPlanet", "GravityRange", 0));
***************
*** 443,446 ****
--- 440,448 ----
  
  
+ 	log_file("gflmelee.ini");
+ 
+ 	int Asteroids = get_config_int("Environment", "Asteroids", 0);
+ 	/*
+ 	int Comets = get_config_int("Environment", "Comets",0);
  	int num;
  
***************
*** 458,464 ****
  		add (c);
  	}
  
  	//asteroids code
- 	Asteroids = get_config_int(NULL, "Asteroids", 0);
  	if (Asteroids > 0)
  	{
--- 460,466 ----
  		add (c);
  	}
+ 	*/
  
  	//asteroids code
  	if (Asteroids > 0)
  	{
***************
*** 496,503 ****
--- 498,509 ----
  	*/
  
+ 	log_file("gflmelee.ini");
+ 
  	if (p_local == 0)
  	{
  		start_menu(allyfleet);
  	}
+ 
+ 	log_file("gflmelee.ini");
  	// send (or receive) ... channel_server is locally either the server, or the client.
  	// fleet numbers are fixed: fleet 0 vs fleet 1
***************
*** 520,525 ****
  	
  
- 	log_file("gflmelee.ini");
- 
  	statsmanager = new StatsManager;
  
--- 526,529 ----
***************
*** 573,577 ****
  			strcpy(shipname, st);
  
! 			message.out(shipname);
  
  
--- 577,582 ----
  			strcpy(shipname, st);
  
! 			message.print(1500, 15, "ship[%s]", shipname);
! 			message.animate(0);
  
  
***************
*** 704,707 ****
--- 709,722 ----
  
  
+ 	message.print(1500, 15, "local[%i]", p_local);
+ 	for ( i = 0; i < num_players; ++i )
+ 	{
+ 		if (player[i]->control->ship)
+ 			message.print(1500, 15, "player[%i] team[%i] ship[%s]", i, player[i]->team, player[i]->control->ship->get_shiptype()->name);
+ 	}
+ 	message.animate(0);
+ 	//readkey();
+ 
+ 
  }
  
***************
*** 994,998 ****
  			if (o->isShip())
  			{
! 				if (is_in_team(o, alliance[iplayer]))
  					++n[0];
  				else
--- 1009,1013 ----
  			if (o->isShip())
  			{
! 				if (is_in_team(o, player[iplayer]->team))
  					++n[0];
  				else
***************
*** 1108,1149 ****
  			// then start searching for the next entry;
  			itarget = lastitarget + toggle_playership;
  			while ( itarget != lastitarget )
  			{
  				
- 				if ( itarget > gametargets.N-1 )
- 					itarget -= gametargets.N;
- 				if ( itarget < 0 )
- 					itarget += gametargets.N;
  				
  				SpaceObject *o = targets->item[itarget];
  				
  				//			Control *c = playercontrols[0];	// is already done earlier
! 				
! 				if ( o->isShip() && is_in_team(o, alliance[iplayer])
  					&& !underplayercontrol(o))
  				{
  					Ship *shp = (Ship*) o;
- 					
- 					/*
- 					Control *c1, *c2;
- 					Ship *s1, *s2;
- 					
- 					c1 = shp->control;
- 					s1 = shp;
- 					
- 					c2 = c;
- 					s2 = c2->ship;
- 					
- 					oldcontrol[iplayer]->select_ship(s2, "none");	// re-assign original control ai.
- 					oldcontrol[iplayer] = s1->control;		// remember control ai of the new ship
- 					playercontrols[iplayer]->select_ship(s1, "none");	// take over the new ship
- 					*/
  					take_control(iplayer, shp);
- 					
- 					
  					break;
  				}
  				
  				itarget += toggle_playership;
  			}
  			
--- 1123,1152 ----
  			// then start searching for the next entry;
  			itarget = lastitarget + toggle_playership;
+ 			if ( itarget > gametargets.N-1 )
+ 				itarget -= gametargets.N;
+ 			if ( itarget < 0 )
+ 				itarget += gametargets.N;
+ 			
  			while ( itarget != lastitarget )
  			{
  				
  				
  				SpaceObject *o = targets->item[itarget];
  				
  				//			Control *c = playercontrols[0];	// is already done earlier
! 
! 				if ( o->isShip() && is_in_team(o, player[iplayer]->team)
  					&& !underplayercontrol(o))
  				{
  					Ship *shp = (Ship*) o;
  					take_control(iplayer, shp);
  					break;
  				}
  				
  				itarget += toggle_playership;
+ 				if ( itarget > gametargets.N-1 )
+ 					itarget -= gametargets.N;
+ 				if ( itarget < 0 )
+ 					itarget += gametargets.N;
  			}
  			

[Timewarp-commit] source/melee mcbodies.cpp,1.12,1.13

[Rob <geo...@us...>]

Update of /cvsroot/timewarp/source/melee
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3753/melee

Modified Files:
	mcbodies.cpp 
Log Message:
flmelee fix

Index: mcbodies.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/melee/mcbodies.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** mcbodies.cpp	24 Mar 2004 23:51:37 -0000	1.12
--- mcbodies.cpp	27 Mar 2004 11:35:54 -0000	1.13
***************
*** 417,422 ****
  }
  
! Stars::Stars() {STACKTRACE
  	int i;
  	v = NULL;
  	set_depth(DEPTH_STARS);
--- 417,426 ----
  }
  
! Stars::Stars()
! {
! 	STACKTRACE;
! 
  	int i;
+ 	push_config_state();
  	v = NULL;
  	set_depth(DEPTH_STARS);
***************
*** 451,454 ****
--- 455,460 ----
  	aa_mode = get_config_int("Stars", "Quality", 5);
  	unload_datafile(stardat);
+ 
+ 	pop_config_state();
  }
  /*

[Timewarp-commit] source/melee mgame.cpp,1.45,1.46 mlog.cpp,1.17,1.18

[Rob <geo...@us...>]

Update of /cvsroot/timewarp/source/melee
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23379/melee

Modified Files:
	mgame.cpp mlog.cpp 
Log Message:
removing comments

Index: mlog.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/melee/mlog.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** mlog.cpp	24 Mar 2004 23:51:38 -0000	1.17
--- mlog.cpp	27 Mar 2004 10:07:18 -0000	1.18
***************
*** 548,553 ****
  	++Nshare;
  
! 	message.print(1500, 15, "Nshare[%i] size[%i]", Nshare, share_num[Nshare-1] * share_size[Nshare-1]);
! 	message.animate(0);
  }
  
--- 548,553 ----
  	++Nshare;
  
! 	//message.print(1500, 15, "Nshare[%i] size[%i]", Nshare, share_num[Nshare-1] * share_size[Nshare-1]);
! 	//message.animate(0);
  }
  

Index: mgame.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/melee/mgame.cpp,v
retrieving revision 1.45
retrieving revision 1.46
diff -C2 -d -r1.45 -r1.46
*** mgame.cpp	24 Mar 2004 23:51:37 -0000	1.45
--- mgame.cpp	27 Mar 2004 10:07:18 -0000	1.46
***************
*** 105,110 ****
  	next_frame += n;
  
! 	message.print(1500, 13, "Increasing latency [%i]", n);
! 	message.animate(0);
  	//if (p_local == 0) readkey();
  }
--- 105,110 ----
  	next_frame += n;
  
! 	//message.print(1500, 13, "Increasing latency [%i]", n);
! 	//message.animate(0);
  	//if (p_local == 0) readkey();
  }

[Timewarp-commit] source/newships shptaubo.cpp,1.13,1.14

[Rob <geo...@us...>]

Update of /cvsroot/timewarp/source/newships
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23245/source/newships

Modified Files:
	shptaubo.cpp 
Log Message:
ship fix

Index: shptaubo.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/newships/shptaubo.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** shptaubo.cpp	24 Mar 2004 23:51:42 -0000	1.13
--- shptaubo.cpp	27 Mar 2004 10:06:21 -0000	1.14
***************
*** 189,198 ****
  	tgt = NULL;
  
! 	double r0 = 1e40, r = -1;
  	Query q;
  	for (q.begin(this, OBJECT_LAYERS, proximity_range); q.currento; q.next())
  		if (q.currento->isShip() && q.currento->exists()
  			&& (!q.currento->isInvisible()) && (!q.currento->sameTeam(this))) {
  			r = distance(q.currento);
  			if (r < r0) {
  				r0 = r;
--- 189,201 ----
  	tgt = NULL;
  
! 	double r0 = 1e40;
  	Query q;
  	for (q.begin(this, OBJECT_LAYERS, proximity_range); q.currento; q.next())
  		if (q.currento->isShip() && q.currento->exists()
  			&& (!q.currento->isInvisible()) && (!q.currento->sameTeam(this))) {
+ 			
+ 			double r;
  			r = distance(q.currento);
+ 
  			if (r < r0) {
  				r0 = r;
***************
*** 200,205 ****
  		}
  	q.end();
! 	assert(r>0&&"Using uninitialized variable");
! 	if ((old_tgt?old_tgt->exists():false) && (tgt?(r>old_range):true) && active) {
  		damage(this, 9999); return; }
  	old_range = r0;
--- 203,209 ----
  		}
  	q.end();
! 
! 
! 	if ((old_tgt?old_tgt->exists():false) && (tgt?(r0>old_range):true) && active) {
  		damage(this, 9999); return; }
  	old_range = r0;

[Timewarp-commit] source/newships shpjnkla.cpp,1.15,1.16

[Rob <geo...@us...>]

Update of /cvsroot/timewarp/source/newships
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23202/source/newships

Modified Files:
	shpjnkla.cpp 
Log Message:
ship fix

Index: shpjnkla.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/newships/shpjnkla.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** shpjnkla.cpp	24 Mar 2004 23:51:41 -0000	1.15
--- shpjnkla.cpp	27 Mar 2004 10:06:08 -0000	1.16
***************
*** 68,72 ****
    int    power_left;
    double base_length;
!   double aim, max_angle, lng;
    SpaceObject *tgt;
  
--- 68,72 ----
    int    power_left;
    double base_length;
!   double aim, max_angle, lng, d_a;
    SpaceObject *tgt;
  
***************
*** 306,309 ****
--- 306,311 ----
  	base_length = length;
  	angle = normalize(angle + spread * (1000 - (random()%2001))/1000.0, PI2);
+ 
+ 	d_a = 0;
  }
  
***************
*** 317,322 ****
  	}
  	if (state == 0) return;
! 	if (frame < frame_count) frame += frame_time;
! 	else {
  		if (!(tgt && tgt->exists())) {
  			tgt = 0;
--- 319,328 ----
  	}
  	if (state == 0) return;
! 
! 	if (frame < frame_count)
! 	{
! 		frame += frame_time;
! 	} else {
! 
  		if (!(tgt && tgt->exists())) {
  			tgt = 0;
***************
*** 340,353 ****
  	else tgt = NULL;
  	
- 	double d_a;
  	if (tgt)
  		d_a = normalize(trajectory_angle(tgt) - angle, PI2);
! 	else {  //d_a = pos->get_angle();
  		base_length = lng * (frame_count - frame) / frame_count; 
- 		tw_error("Using uninitialized variable d_a bellow few line");
- 		d_a = -12345;
  	}
  	length = base_length;
- 	//        state = 0; return;
  	SpaceLine::calculate();
  	
--- 346,356 ----
  	else tgt = NULL;
  	
  	if (tgt)
  		d_a = normalize(trajectory_angle(tgt) - angle, PI2);
! 	else {
  		base_length = lng * (frame_count - frame) / frame_count; 
  	}
+ 
  	length = base_length;
  	SpaceLine::calculate();
  	

[Timewarp-commit] source/newships shpcrore.cpp,1.5,1.6

[Rob <geo...@us...>]

Update of /cvsroot/timewarp/source/newships
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23119/source/newships

Modified Files:
	shpcrore.cpp 
Log Message:
ship fix

Index: shpcrore.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/newships/shpcrore.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** shpcrore.cpp	24 Mar 2004 23:51:40 -0000	1.5
--- shpcrore.cpp	27 Mar 2004 10:05:54 -0000	1.6
***************
*** 241,269 ****
  void CromeShot::animateExplosion()
  {
!         if (exploded_already) return;
!         exploded_already = true;
! 
!         game->add(new Animation(this, pos, data->spriteWeaponExplosion, 0, 8, 50, LAYER_EXPLOSIONS));
!         game->add(new Animation(this, pos, data->spriteExtraExplosion, 0, 12, 50, LAYER_HOTSPOTS));
! 
!         Query q;
! 
!         double r;
! 
!         for (q.begin(this, OBJECT_LAYERS, blast_range); q.currento; q.next()) {
!                 if (q.currento != direct_hit) {
! 		  tw_error("Using uninitialized variable r");
! 		  r = -1000;
!                         if (q.currento->sameShip(this)) r *= 2;
!                         if (r > blast_range) continue;
  
!                         r = distance(q.currento) / blast_range;
  
!                         if (q.currento->isShot())
! 							damage(q.currento, (int)ceil(blast_damage_shots * (1 - r*r*r*r)));
! 						else
! 							damage(q.currento, (int)ceil(blast_damage * (1 - r*r*r*r)));
  
! 		} }
  
  }
--- 241,275 ----
  void CromeShot::animateExplosion()
  {
! 	// this is part of physics (although the name suggests otherwise)
! 	
! 	if (exploded_already) return;
! 	exploded_already = true;
! 	
! 	game->add(new Animation(this, pos, data->spriteWeaponExplosion, 0, 8, 50, LAYER_EXPLOSIONS));
! 	game->add(new Animation(this, pos, data->spriteExtraExplosion, 0, 12, 50, LAYER_HOTSPOTS));
! 	
! 	Query q;
  
! 	
! 	for (q.begin(this, OBJECT_LAYERS, blast_range); q.currento; q.next())
! 	{
! 		if (q.currento != direct_hit)
! 		{
! 			// damage everything in range...
! 			double r;
! 			r = distance(q.currento) / blast_range;
  
! 			if (q.currento->sameShip(this))
! 				r *= 2;				// reduced damage for your own ship ??
  
! 			if (r > 1) continue;	// out of damage range
! 			
! 			
! 			if (q.currento->isShot())
! 				damage(q.currento, (int)ceil(blast_damage_shots * (1 - r*r*r*r)));
! 			else
! 				damage(q.currento, (int)ceil(blast_damage * (1 - r*r*r*r)));
! 		}
! 	}
  
  }

[Timewarp-commit] interfaces/gflmelee info.txt,1.4,1.5

[Rob <geo...@us...>]

Update of /cvsroot/timewarp/interfaces/gflmelee
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24094/interfaces/gflmelee

Modified Files:
	info.txt 
Log Message:
no message

Index: info.txt
===================================================================
RCS file: /cvsroot/timewarp/interfaces/gflmelee/info.txt,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** info.txt	1 Mar 2004 23:21:49 -0000	1.4
--- info.txt	26 Mar 2004 18:22:21 -0000	1.5
***************
*** 32,33 ****
--- 32,34 ----
  PlayerAlliance = 0
  EnemyAlliance = 1
+ 

[Timewarp-commit] client.ini,1.31,1.32 fleets.ini,1.82,1.83 scp.ini,1.38,1.39

[Rob <geo...@us...>]

Update of /cvsroot/timewarp
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24094

Modified Files:
	client.ini fleets.ini scp.ini 
Log Message:
no message

Index: fleets.ini
===================================================================
RCS file: /cvsroot/timewarp/fleets.ini,v
retrieving revision 1.82
retrieving revision 1.83
diff -C2 -d -r1.82 -r1.83
*** fleets.ini	29 Feb 2004 23:22:17 -0000	1.82
--- fleets.ini	26 Mar 2004 18:22:20 -0000	1.83
***************
*** 1,21 ****
  [Player1]
! Slot0 = tauar
! Slot1 = bipka
! Slot2 = mmrxf
! Slot3 = arisk
! Slot4 = earcr
! Size = 2
! Slot5 = shosc
! Slot6 = syrpe
  MaxFleetCost = 500
  
  [Player2]
! Slot0 = conca
! Slot1 = bipka
! Slot2 = mycpo
! Slot3 = spael
! Slot4 = umgdr
! Slot5 = vuxin
! Slot6 = yehte
! Size = 2
  MaxFleetCost = 500
--- 1,127 ----
  [Player1]
! Slot0 = earcr
! Slot1 = ilwav
! Slot2 = kzedr
! Slot3 = mmrxf
! Size = 79
  MaxFleetCost = 500
+ Slot4 = mycpo
+ Slot5 = spael
+ Slot6 = syrpe
+ Slot7 = umgdr
+ Slot8 = vuxin
+ Slot9 = yehte
+ Slot10 = druma
+ Slot11 = kohma
+ Slot12 = meltr
+ Slot13 = orzne
+ Slot14 = pkufu
+ Slot15 = supbl
+ Slot16 = thrto
+ Slot17 = utwju
+ Slot18 = zfpst
+ Slot19 = clapi
+ Slot20 = dakvi
+ Slot21 = dooco
+ Slot22 = exqen
+ Slot23 = harra
+ Slot24 = herex
+ Slot25 = ktacr
+ Slot26 = lk_sa
+ Slot27 = owavo
+ Slot28 = plopl
+ Slot29 = vyrin
+ Slot30 = xchex
+ Slot31 = artem
+ Slot32 = choex
+ Slot33 = clofl
+ Slot34 = clofl
+ Slot35 = conca
+ Slot36 = crore
+ Slot37 = dajem
+ Slot38 = djila
+ Slot39 = dragr
+ Slot40 = earc2
+ Slot41 = estgu
+ Slot42 = fiear
+ Slot43 = geror
+ Slot44 = glads
+ Slot45 = hotsp
+ Slot46 = hubde
+ Slot47 = hydcr
+ Slot48 = ilwsp
+ Slot49 = impka
+ Slot50 = impka
+ Slot51 = jnkla
+ Slot52 = jygst
+ Slot53 = kahbo
+ Slot54 = montr
+ Slot55 = neodr
+ Slot56 = nisha
+ Slot57 = ostdi
+ Slot58 = plala
+ Slot59 = quasi
+ Slot60 = quawr
+ Slot61 = rogsq
+ Slot62 = sefn2
+ Slot63 = strsc
+ Slot64 = tauar
+ Slot65 = tauda
+ Slot66 = tauem
+ Slot67 = taugl
+ Slot68 = tauhu
+ Slot69 = taule
+ Slot70 = taumc
+ Slot71 = taust
+ Slot72 = trige
+ Slot73 = ulzin
+ Slot74 = wassu
+ Slot75 = wistr
+ Slot76 = xxxma
+ Slot77 = yusra
+ Slot78 = zeksh
  
  [Player2]
! Slot0 = earcr
! Slot1 = exqen
! Size = 25
  MaxFleetCost = 500
+ Slot2 = bogce
+ Slot3 = bubbo
+ Slot4 = conho
+ Slot5 = dyzha
+ Slot6 = earc2
+ Slot7 = earc3
+ Slot8 = estgu
+ Slot9 = klidr
+ Slot10 = taubo
+ Slot11 = taufi
+ Slot12 = taume
+ Slot13 = taume
+ Slot14 = tausl
+ Slot15 = tauto
+ Slot16 = tautu
+ Slot17 = telno
+ Slot18 = terbi
+ Slot19 = tougr
+ Slot20 = vioge
+ Slot21 = vuvji
+ Slot22 = wolsw
+ Slot23 = xaaar
+ Slot24 = xilcr
+ 
+ [Player3]
+ Slot0 = andgu
+ Slot1 = chebr
+ Slot2 = earcr
+ Size = 12
+ MaxFleetCost = 500
+ Slot3 = kzedr
+ Slot4 = mmrxf
+ Slot5 = mycpo
+ Slot6 = shosc
+ Slot7 = spael
+ Slot8 = syrpe
+ Slot9 = umgdr
+ Slot10 = vuxin
+ Slot11 = yehte

Index: client.ini
===================================================================
RCS file: /cvsroot/timewarp/client.ini,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** client.ini	18 Mar 2004 23:38:36 -0000	1.31
--- client.ini	26 Mar 2004 18:22:20 -0000	1.32
***************
*** 3,11 ****
  Prediction = 0
  Port = 15515
! Address = 192.168.0.1
  NetworkMeleeUseTeams = 0
! Nhumans = 1
! Nbots = 6
! GameName = Planet Explorer
  
  [System]
--- 3,12 ----
  Prediction = 0
  Port = 15515
! Address = 192.168.0.4
  NetworkMeleeUseTeams = 0
! 
! GameName = Melee
! Nhumans = 2
! Nbots = 0
  
  [System]
***************
*** 28,33 ****
  
  [Sound]
! SoundOn = 2
! MusicOn = 2
  SoundVolume = 174
  MusicVolume = 176
--- 29,35 ----
  
  [Sound]
! 
! SoundOn = 0
! MusicOn = 0
  SoundVolume = 174
  MusicVolume = 176
***************
*** 36,47 ****
  
  
- [Planet]
- PlanetDimension = 3
- PlanetUsespec = 1
- 
  [View]
  View = Hero
  ;determines = where the camera goes
! InterpolateFrames = 1
  ;0 = low quality, 1 = high quality
  Mip_min = 0
--- 38,45 ----
  
  
  [View]
  View = Hero
  ;determines = where the camera goes
! InterpolateFrames = 0
  ;0 = low quality, 1 = high quality
  Mip_min = 0
***************
*** 78,82 ****
  [Menu]
  skin = interfaces/gametest
! SelectGame = 16
! 
  
--- 76,79 ----
  [Menu]
  skin = interfaces/gametest
! SelectGame = 0
  

Index: scp.ini
===================================================================
RCS file: /cvsroot/timewarp/scp.ini,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -d -r1.38 -r1.39
*** scp.ini	1 Mar 2004 23:21:44 -0000	1.38
--- scp.ini	26 Mar 2004 18:22:21 -0000	1.39
***************
*** 11,28 ****
  Fire = 67
  AltFire = 63
! Special = 106
  Next_Target = 65
  Prev_Target = 66
  Closest_Target = 16
! Backwards = 85
! Extra1 = 0
! Extra2 = 0
! Extra3 = 0
! Extra4 = 0
! Extra5 = 0
! Extra6 = 0
  Communicate = 3
  
  
  [Config1]
  Backwards = 19
--- 11,30 ----
  Fire = 67
  AltFire = 63
! Special = 104
  Next_Target = 65
  Prev_Target = 66
  Closest_Target = 16
! 
! Backwards = 39
! Extra1 = 72
! Extra2 = 73
! Extra3 = 25
! Extra4 = 21
! Extra5 = 8
! Extra6 = 10
  Communicate = 3
  
  
+ 
  [Config1]
  Backwards = 19
***************
*** 30,36 ****
  Left = 1
  Right = 4
! Fire = 10
  AltFire = 14
! Special = 11
  Next_Target = 6
  Prev_Target = 7
--- 32,38 ----
  Left = 1
  Right = 4
! Fire = 103
  AltFire = 14
! Special = 105
  Next_Target = 6
  Prev_Target = 7
***************
*** 42,45 ****
--- 44,48 ----
  Extra5 = 0
  Extra6 = 0
+ Communicate = 0
  
  
***************
*** 75,79 ****
  
  [Player2]
! Type = Human
  Config = 1
  Team = 1
--- 78,82 ----
  
  [Player2]
! Type = WussieBot
  Config = 1
  Team = 1

[Timewarp-commit] gflmelee.ini,1.9,1.10

[Rob <geo...@us...>]

Update of /cvsroot/timewarp
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19557

Modified Files:
	gflmelee.ini 
Log Message:
no message

Index: gflmelee.ini
===================================================================
RCS file: /cvsroot/timewarp/gflmelee.ini,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** gflmelee.ini	15 Feb 2004 13:19:29 -0000	1.9
--- gflmelee.ini	26 Mar 2004 18:03:01 -0000	1.10
***************
*** 11,15 ****
  
  RadarLayout = 1
! ToggleHealthBar = 0
  ToggleFleetList = 0
  ToggleRadar = 0
--- 11,15 ----
  
  RadarLayout = 1
! ToggleHealthBar = 1
  ToggleFleetList = 0
  ToggleRadar = 0

[Timewarp-commit] gamex/gamedata/player playerinfo.ini,1.1,1.2

[Rob <geo...@us...>]

Update of /cvsroot/timewarp/gamex/gamedata/player
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19073/gamex/gamedata/player

Modified Files:
	playerinfo.ini 
Log Message:
fg

Index: playerinfo.ini
===================================================================
RCS file: /cvsroot/timewarp/gamex/gamedata/player/playerinfo.ini,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** playerinfo.ini	28 Feb 2004 15:19:38 -0000	1.1
--- playerinfo.ini	26 Mar 2004 18:00:35 -0000	1.2
***************
*** 11,15 ****
  player = Zel
  ship = Titanic
- Star = -1
  
  [Fleet]
--- 11,14 ----

[Timewarp-commit] gamex/planetscan surface_default.ini,1.1.1.1,1.2 surface_europe.ini,1.1.1.1,1.2 surface_flames.ini,1.1.1.1,1.2 surface_giant_blue.ini,1.1.1.1,1.2 surface_hot.ini,1.1.1.1,1.2 surface_icy.ini,1.1.1.1,1.2 surface_medium_purp.ini,1.1.1.1,1.2 surface_small_brown.ini,1.1.1.1,1.2 surface_small_purp.ini,1.1.1.1,1.2

[Rob <geo...@us...>]

Update of /cvsroot/timewarp/gamex/planetscan
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18578/gamex/planetscan

Modified Files:
	surface_default.ini surface_europe.ini surface_flames.ini 
	surface_giant_blue.ini surface_hot.ini surface_icy.ini 
	surface_medium_purp.ini surface_small_brown.ini 
	surface_small_purp.ini 
Log Message:
fg

Index: surface_flames.ini
===================================================================
RCS file: /cvsroot/timewarp/gamex/planetscan/surface_flames.ini,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** surface_flames.ini	4 Jan 2004 22:47:55 -0000	1.1.1.1
--- surface_flames.ini	26 Mar 2004 17:58:25 -0000	1.2
***************
*** 0 ****
--- 1,15 ----
+ 
+ NumMin = 5
+ NumMax = 15
+ AvSize = 1
+ 
+ [fraction]
+ common = 1.0
+ corrosive = 0.5
+ base = 0.1
+ noble = 0.0
+ rare = 0.0
+ precious = 0.0
+ radioactive = 0.0
+ exotic = 0.0
+ 

Index: surface_europe.ini
===================================================================
RCS file: /cvsroot/timewarp/gamex/planetscan/surface_europe.ini,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** surface_europe.ini	4 Jan 2004 22:47:48 -0000	1.1.1.1
--- surface_europe.ini	26 Mar 2004 17:58:25 -0000	1.2
***************
*** 0 ****
--- 1,15 ----
+ 
+ NumMin = 5
+ NumMax = 15
+ AvSize = 1
+ 
+ [fraction]
+ common = 1.0
+ corrosive = 0.5
+ base = 0.1
+ noble = 0.0
+ rare = 0.0
+ precious = 0.0
+ radioactive = 0.0
+ exotic = 0.0
+ 

Index: surface_icy.ini
===================================================================
RCS file: /cvsroot/timewarp/gamex/planetscan/surface_icy.ini,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** surface_icy.ini	4 Jan 2004 22:48:19 -0000	1.1.1.1
--- surface_icy.ini	26 Mar 2004 17:58:25 -0000	1.2
***************
*** 0 ****
--- 1,16 ----
+ 
+ NumMin = 5
+ NumMax = 15
+ AvSize = 1
+ 
+ [fraction]
+ common = 1.0
+ corrosive = 0.5
+ base = 0.1
+ noble = 0.0
+ rare = 0.0
+ precious = 0.0
+ radioactive = 0.0
+ exotic = 0.0
+ 
+ 

Index: surface_default.ini
===================================================================
RCS file: /cvsroot/timewarp/gamex/planetscan/surface_default.ini,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** surface_default.ini	4 Jan 2004 22:47:40 -0000	1.1.1.1
--- surface_default.ini	26 Mar 2004 17:58:25 -0000	1.2
***************
*** 0 ****
--- 1,15 ----
+ 
+ NumMin = 5
+ NumMax = 15
+ AvSize = 1
+ 
+ [fraction]
+ common = 1.0
+ corrosive = 0.5
+ base = 0.1
+ noble = 0.0
+ rare = 0.0
+ precious = 0.0
+ radioactive = 0.0
+ exotic = 0.0
+ 

Index: surface_medium_purp.ini
===================================================================
RCS file: /cvsroot/timewarp/gamex/planetscan/surface_medium_purp.ini,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** surface_medium_purp.ini	4 Jan 2004 22:48:26 -0000	1.1.1.1
--- surface_medium_purp.ini	26 Mar 2004 17:58:25 -0000	1.2
***************
*** 0 ****
--- 1,16 ----
+ 
+ NumMin = 5
+ NumMax = 15
+ AvSize = 1
+ 
+ [fraction]
+ common = 1.0
+ corrosive = 0.5
+ base = 0.1
+ noble = 0.0
+ rare = 0.0
+ precious = 0.0
+ radioactive = 0.0
+ exotic = 0.0
+ 
+ 

Index: surface_small_purp.ini
===================================================================
RCS file: /cvsroot/timewarp/gamex/planetscan/surface_small_purp.ini,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** surface_small_purp.ini	4 Jan 2004 22:48:50 -0000	1.1.1.1
--- surface_small_purp.ini	26 Mar 2004 17:58:25 -0000	1.2
***************
*** 0 ****
--- 1,16 ----
+ 
+ NumMin = 5
+ NumMax = 15
+ AvSize = 1
+ 
+ [fraction]
+ common = 1.0
+ corrosive = 0.5
+ base = 0.1
+ noble = 0.0
+ rare = 0.0
+ precious = 0.0
+ radioactive = 0.0
+ exotic = 0.0
+ 
+ 

Index: surface_small_brown.ini
===================================================================
RCS file: /cvsroot/timewarp/gamex/planetscan/surface_small_brown.ini,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** surface_small_brown.ini	4 Jan 2004 22:48:42 -0000	1.1.1.1
--- surface_small_brown.ini	26 Mar 2004 17:58:25 -0000	1.2
***************
*** 0 ****
--- 1,16 ----
+ 
+ NumMin = 5
+ NumMax = 15
+ AvSize = 1
+ 
+ [fraction]
+ common = 1.0
+ corrosive = 0.5
+ base = 0.1
+ noble = 0.0
+ rare = 0.0
+ precious = 0.0
+ radioactive = 0.0
+ exotic = 0.0
+ 
+ 

Index: surface_giant_blue.ini
===================================================================
RCS file: /cvsroot/timewarp/gamex/planetscan/surface_giant_blue.ini,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** surface_giant_blue.ini	4 Jan 2004 22:48:03 -0000	1.1.1.1
--- surface_giant_blue.ini	26 Mar 2004 17:58:25 -0000	1.2
***************
*** 0 ****
--- 1,15 ----
+ 
+ NumMin = 5
+ NumMax = 15
+ AvSize = 1
+ 
+ [fraction]
+ common = 1.0
+ corrosive = 0.5
+ base = 0.1
+ noble = 0.0
+ rare = 0.0
+ precious = 0.0
+ radioactive = 0.0
+ exotic = 0.0
+ 

Index: surface_hot.ini
===================================================================
RCS file: /cvsroot/timewarp/gamex/planetscan/surface_hot.ini,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** surface_hot.ini	4 Jan 2004 22:48:11 -0000	1.1.1.1
--- surface_hot.ini	26 Mar 2004 17:58:25 -0000	1.2
***************
*** 0 ****
--- 1,15 ----
+ 
+ NumMin = 5
+ NumMax = 15
+ AvSize = 1
+ 
+ [fraction]
+ common = 1.0
+ corrosive = 0.5
+ base = 0.1
+ noble = 0.0
+ rare = 0.0
+ precious = 0.0
+ radioactive = 0.0
+ exotic = 0.0
+ 

[Timewarp-commit] source/newships shpjurcu.cpp,1.4,1.5 shpkabwe.cpp,1.14,1.15 shpnarlu.cpp,1.14,1.15 shpqlore.cpp,1.11,1.12 shptauda.cpp,1.11,1.12 shpxxxma.cpp,1.16,1.17

[Rob <geo...@us...>]

Update of /cvsroot/timewarp/source/newships
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18079/newships

Modified Files:
	shpjurcu.cpp shpkabwe.cpp shpnarlu.cpp shpqlore.cpp 
	shptauda.cpp shpxxxma.cpp 
Log Message:
rand() check

Index: shpqlore.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/newships/shpqlore.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** shpqlore.cpp	24 Mar 2004 23:51:42 -0000	1.11
--- shpqlore.cpp	26 Mar 2004 17:55:49 -0000	1.12
***************
*** 137,142 ****
  		tries = 0;
  		while (tries < 30) {
! 			H.x = 18 + (rand() % 27);  //NOT part of physics ; not synchronized in network games ; varies with graphics mode
! 			H.y = 15 + (rand() % 36);
  			tries++;
  			col = getpixel(bmp,iround(H.x),iround(H.y));
--- 137,142 ----
  		tries = 0;
  		while (tries < 30) {
! 			H.x = 18 + (rand() % 27);	//graphics
! 			H.y = 15 + (rand() % 36);	//graphics
  			tries++;
  			col = getpixel(bmp,iround(H.x),iround(H.y));
***************
*** 176,184 ****
          if (turn_right)
                  data->spriteWeapon->animate(Vector2(pos.x + frnt_y * tx - frnt_x * ty,
!                      pos.y + frnt_y * ty + frnt_x * tx), s_index + ((rand()%3) << 6), space);
          if (turn_left)
                  data->spriteWeapon->animate(Vector2(pos.x + frnt_y * tx + frnt_x * ty,
                       pos.y + frnt_y * ty - frnt_x * tx),
! 					 s_index + ((rand()%3) << 6), space);
  
          s_index += 32; s_index &= 63;
--- 176,184 ----
          if (turn_right)
                  data->spriteWeapon->animate(Vector2(pos.x + frnt_y * tx - frnt_x * ty,
!                      pos.y + frnt_y * ty + frnt_x * tx), s_index + ((rand()%3) << 6), space);	//graphics
          if (turn_left)
                  data->spriteWeapon->animate(Vector2(pos.x + frnt_y * tx + frnt_x * ty,
                       pos.y + frnt_y * ty - frnt_x * tx),
! 					 s_index + ((rand()%3) << 6), space);	//graphics
  
          s_index += 32; s_index &= 63;
***************
*** 186,199 ****
          if (thrust) {
                  data->spriteExtra->animate(Vector2(pos.x + back_y_1 * tx - back_x * ty,
!                      pos.y + back_y_1 * ty + back_x * tx), s_index + ((rand()%3) << 6), space);
                  data->spriteExtra->animate(Vector2(pos.x + back_y_1 * tx + back_x * ty,
!                      pos.y + back_y_1 * ty - back_x * tx), s_index + ((rand()%3) << 6), space); }
          else {
                  if (turn_left)
                          data->spriteWeapon->animate(Vector2(pos.x + back_y * tx - back_x * ty,
!                              pos.y + back_y * ty + back_x * tx), s_index + ((rand()%3) << 6), space);
                  if (turn_right)
                          data->spriteWeapon->animate(Vector2(pos.x + back_y * tx + back_x * ty,
!                              pos.y + back_y * ty - back_x * tx), s_index + ((rand()%3) << 6), space); }
  
          Ship::animate(space);
--- 186,199 ----
          if (thrust) {
                  data->spriteExtra->animate(Vector2(pos.x + back_y_1 * tx - back_x * ty,
!                      pos.y + back_y_1 * ty + back_x * tx), s_index + ((rand()%3) << 6), space);	//graphics
                  data->spriteExtra->animate(Vector2(pos.x + back_y_1 * tx + back_x * ty,
!                      pos.y + back_y_1 * ty - back_x * tx), s_index + ((rand()%3) << 6), space); }	//graphics
          else {
                  if (turn_left)
                          data->spriteWeapon->animate(Vector2(pos.x + back_y * tx - back_x * ty,
!                              pos.y + back_y * ty + back_x * tx), s_index + ((rand()%3) << 6), space);	//graphics
                  if (turn_right)
                          data->spriteWeapon->animate(Vector2(pos.x + back_y * tx + back_x * ty,
!                              pos.y + back_y * ty - back_x * tx), s_index + ((rand()%3) << 6), space); }	//graphics
  
          Ship::animate(space);

Index: shpjurcu.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/newships/shpjurcu.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** shpjurcu.cpp	24 Mar 2004 23:51:41 -0000	1.4
--- shpjurcu.cpp	26 Mar 2004 17:55:49 -0000	1.5
***************
*** 74,83 ****
  int JurgathaCutter::activate_weapon()
  {
! 	int random_number = rand()%10;
  
      game->add(new Laser(this, angle, pallete_color[weaponColor], weaponRange,
        weaponDamage, weapon_rate, this, Vector2(-(double)(random_number), 2.0), true));
  
!     random_number = rand()%10;
  
      game->add(new Laser(this, angle, pallete_color[weaponColor], weaponRange,
--- 74,83 ----
  int JurgathaCutter::activate_weapon()
  {
! 	int random_number = random()%10;
  
      game->add(new Laser(this, angle, pallete_color[weaponColor], weaponRange,
        weaponDamage, weapon_rate, this, Vector2(-(double)(random_number), 2.0), true));
  
!     random_number = random()%10;
  
      game->add(new Laser(this, angle, pallete_color[weaponColor], weaponRange,

Index: shpxxxma.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/newships/shpxxxma.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** shpxxxma.cpp	24 Mar 2004 23:51:43 -0000	1.16
--- shpxxxma.cpp	26 Mar 2004 17:55:49 -0000	1.17
***************
*** 321,325 ****
  
    if ((tentacleFrames > 0) && (latched)) {
!     int RandFrame = rand() % 4;
  //    double TentacleX = ship->normal_x() + (cos(angle ) * height() * .75);
  //    double TentacleY = ship->normal_y() + (sin(angle ) * width()  * .75);
--- 321,325 ----
  
    if ((tentacleFrames > 0) && (latched)) {
!     int RandFrame = rand() % 4;	//graphics
  //    double TentacleX = ship->normal_x() + (cos(angle ) * height() * .75);
  //    double TentacleY = ship->normal_y() + (sin(angle ) * width()  * .75);

Index: shpkabwe.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/newships/shpkabwe.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** shpkabwe.cpp	24 Mar 2004 23:51:41 -0000	1.14
--- shpkabwe.cpp	26 Mar 2004 17:55:49 -0000	1.15
***************
*** 786,794 ****
  				break;	// too bad !!
  
! 			dy = rand() % hshield;
  			if (edge_left[dy] == -1)
  				continue;
  			
! 			if ( !(rand() % 2) )
  				dx = edge_left[dy];
  			else
--- 786,794 ----
  				break;	// too bad !!
  
! 			dy = rand() % hshield;	//graphics
  			if (edge_left[dy] == -1)
  				continue;
  			
! 			if ( !(rand() % 2) )	//graphics
  				dx = edge_left[dy];
  			else

Index: shpnarlu.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/newships/shpnarlu.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** shpnarlu.cpp	24 Mar 2004 23:51:42 -0000	1.14
--- shpnarlu.cpp	26 Mar 2004 17:55:49 -0000	1.15
***************
*** 418,425 ****
  		int i, N;
  		
! 		N = 5 + rand() % 5;
  
  		double ang, R;
! 		ang = (rand() % 360) * PI/180;
  		
  		for ( i = 0; i < N; ++i )
--- 418,425 ----
  		int i, N;
  		
! 		N = 5 + rand() % 5;	//graphics
  
  		double ang, R;
! 		ang = (rand() % 360) * PI/180;	//graphics
  		
  		for ( i = 0; i < N; ++i )
***************
*** 429,436 ****
  			//dy = (random(double(ih)) - 0.5*ih) / N;
  
! 			//ang += rand(PI/2) - PI/4;
! 			ang += (rand() % 180 - 90) * PI/180;
! 			//R = rand(double(Rmax)) / N;
! 			R = (rand() % int(Rmax+1)) / N;
  			dx = R * cos(ang);
  			dy = R * sin(ang);
--- 429,434 ----
  			//dy = (random(double(ih)) - 0.5*ih) / N;
  
! 			ang += (rand() % 180 - 90) * PI/180;	//graphics
! 			R = (rand() % int(Rmax+1)) / N;	//graphics
  			dx = R * cos(ang);
  			dy = R * sin(ang);

Index: shptauda.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/newships/shptauda.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** shptauda.cpp	24 Mar 2004 23:51:42 -0000	1.11
--- shptauda.cpp	26 Mar 2004 17:55:49 -0000	1.12
***************
*** 156,160 ****
  		int	_old_trans = aa_get_trans();
  		// changed tw_random into rand - GEO - so that physics are not affected by the animation
! 		aa_set_trans(rand()%136);
  		data->spriteWeaponExplosion->animate(pos+edge(), 0, space);
  		aa_set_trans(_old_trans); }
--- 156,160 ----
  		int	_old_trans = aa_get_trans();
  		// changed tw_random into rand - GEO - so that physics are not affected by the animation
! 		aa_set_trans(rand()%136);	//graphics
  		data->spriteWeaponExplosion->animate(pos+edge(), 0, space);
  		aa_set_trans(_old_trans); }

[Timewarp-commit] source/sc1ships shpumgdr.cpp,1.15,1.16 shpvuxin.cpp,1.10,1.11

[Rob <geo...@us...>]

Update of /cvsroot/timewarp/source/sc1ships
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18079/sc1ships

Modified Files:
	shpumgdr.cpp shpvuxin.cpp 
Log Message:
rand() check

Index: shpvuxin.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/sc1ships/shpvuxin.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** shpvuxin.cpp	24 Mar 2004 23:51:44 -0000	1.10
--- shpvuxin.cpp	26 Mar 2004 17:55:49 -0000	1.11
***************
*** 104,109 ****
  		tries = 0;
  		while (tries < 10) {
! 			hx = 18 + (rand() % 27);  //NOT part of physics ; not synchronized in network games ; varies with graphics mode
! 			hy = 15 + (rand() % 36);
  			tries++;
  			col = getpixel(bmp,hx,hy);
--- 104,109 ----
  		tries = 0;
  		while (tries < 10) {
! 			hx = 18 + (rand() % 27);	//graphics
! 			hy = 15 + (rand() % 36);	//graphics
  			tries++;
  			col = getpixel(bmp,hx,hy);
***************
*** 153,161 ****
  				data->spriteWeapon->animate(pos + 
  					rotate(Vector2(-frnt_x, frnt_y), angle-PI/2),
! 					s_index + ((rand()%3) << 6), space);
          if (turn_left)
  				data->spriteWeapon->animate(pos + 
  					rotate(Vector2(frnt_x,frnt_y), angle-PI/2),
! 					s_index + ((rand()%3) << 6), space);
  
          s_index += 32; s_index &= 63;
--- 153,161 ----
  				data->spriteWeapon->animate(pos + 
  					rotate(Vector2(-frnt_x, frnt_y), angle-PI/2),
! 					s_index + ((rand()%3) << 6), space);	//graphics
          if (turn_left)
  				data->spriteWeapon->animate(pos + 
  					rotate(Vector2(frnt_x,frnt_y), angle-PI/2),
! 					s_index + ((rand()%3) << 6), space);	//graphics
  
          s_index += 32; s_index &= 63;
***************
*** 164,180 ****
  				data->spriteExtra->animate(pos + 
  					rotate(Vector2(back_x, back_y_1), angle-PI/2),
! 					s_index + ((rand()%3) << 6), space);
                  data->spriteExtra->animate(pos + 
  					rotate(Vector2(-back_x, back_y_1), angle-PI/2),
! 					s_index + ((rand()%3) << 6), space); }
          else {
                  if (turn_left)
  						data->spriteWeapon->animate(pos + 
  							rotate(Vector2(-back_x, back_y), angle-PI/2),
! 							s_index + ((rand()%3) << 6), space);
                  if (turn_right)
  						data->spriteWeapon->animate(pos + 
  							rotate(Vector2(back_x, back_y), angle-PI/2),
! 							s_index + ((rand()%3) << 6), space); }
  
          Ship::animate(space);
--- 164,180 ----
  				data->spriteExtra->animate(pos + 
  					rotate(Vector2(back_x, back_y_1), angle-PI/2),
! 					s_index + ((rand()%3) << 6), space);	//graphics
                  data->spriteExtra->animate(pos + 
  					rotate(Vector2(-back_x, back_y_1), angle-PI/2),
! 					s_index + ((rand()%3) << 6), space); }	//graphics
          else {
                  if (turn_left)
  						data->spriteWeapon->animate(pos + 
  							rotate(Vector2(-back_x, back_y), angle-PI/2),
! 							s_index + ((rand()%3) << 6), space);	//graphics
                  if (turn_right)
  						data->spriteWeapon->animate(pos + 
  							rotate(Vector2(back_x, back_y), angle-PI/2),
! 							s_index + ((rand()%3) << 6), space); }	//graphics
  
          Ship::animate(space);

Index: shpumgdr.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/sc1ships/shpumgdr.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** shpumgdr.cpp	24 Mar 2004 23:51:44 -0000	1.15
--- shpumgdr.cpp	26 Mar 2004 17:55:49 -0000	1.16
***************
*** 168,172 ****
    if (!umgahship || !umgahship->exists() || !umgahship->firing) return;
    int si = sprite_index;
!   sprite_index += ((rand()%6) << 6);
    SpaceObject::animate(space);
    sprite_index = si;
--- 168,172 ----
    if (!umgahship || !umgahship->exists() || !umgahship->firing) return;
    int si = sprite_index;
!   sprite_index += ((rand()%6) << 6);	//graphics
    SpaceObject::animate(space);
    sprite_index = si;

[Timewarp-commit] source/melee mcontrol.cpp,1.21,1.22

[Rob <geo...@us...>]

Update of /cvsroot/timewarp/source/melee
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18079/melee

Modified Files:
	mcontrol.cpp 
Log Message:
rand() check

Index: mcontrol.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/melee/mcontrol.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** mcontrol.cpp	24 Mar 2004 23:51:37 -0000	1.21
--- mcontrol.cpp	26 Mar 2004 17:55:49 -0000	1.22
***************
*** 94,100 ****
  
  
! int Control::rand() {
! 	if (channel == channel_none) return random();
! 	return (::rand() ^ ((::rand() << 12) + (::rand() <<24))) & 0x7fffffff;
  	}
  void Control::setup() {}
--- 94,104 ----
  
  
! int Control::rand()
! {
! 	// this is synched with physics
! 	if (channel == channel_none)
! 		return random();
! 	// this is local, so uses a local unsynched rand
! 	return (::rand() ^ ((::rand() << 12) + (::rand() <<24))) & 0x7fffffff;	// local
  	}
  void Control::setup() {}

[Timewarp-commit] source/util aautil.c,1.6,1.7

[Rob <geo...@us...>]

Update of /cvsroot/timewarp/source/util
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18079/util

Modified Files:
	aautil.c 
Log Message:
rand() check

Index: aautil.c
===================================================================
RCS file: /cvsroot/timewarp/source/util/aautil.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** aautil.c	24 Mar 2004 23:51:45 -0000	1.6
--- aautil.c	26 Mar 2004 17:55:49 -0000	1.7
***************
*** 809,813 ****
  	} else {
  		//uh.. what do we do now?
! 		_aa.r = rand() & 255;
  		t1 = 0;
  	}
--- 809,813 ----
  	} else {
  		//uh.. what do we do now?
! 		_aa.r = rand() & 255;	//graphics
  		t1 = 0;
  	}

[Timewarp-commit] source melee.h,1.16,1.17

[Rob <geo...@us...>]

Update of /cvsroot/timewarp/source
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5834

Modified Files:
	melee.h 
Log Message:
no message

Index: melee.h
===================================================================
RCS file: /cvsroot/timewarp/source/melee.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** melee.h	24 Mar 2004 23:51:34 -0000	1.16
--- melee.h	26 Mar 2004 16:56:01 -0000	1.17
***************
*** 424,427 ****
--- 424,435 ----
  void animate_bmp(BITMAP *bmp, Vector2 pos, Frame *space);
  
+ struct Light
+ {
+ 	double r, g, b;
+ 	double intensity;
+ 	double angle;
+ };
+ 
+ extern bool showshademaps;
  
  class SpaceSprite {
***************
*** 515,518 ****
--- 523,532 ----
  	int      width()  const {return w;}
  	int      height() const {return h;}
+ 
+ 	double *shademap;
+ 	double *rmap, *gmap, *bmap;
+ 	void init_shademaps();
+ 	void destroy_shademaps();
+ 	BITMAP *SpaceSprite::add_shades(BITMAP *ref, double amb, Light *lights, int Nlights, double ref_angle);
  };
  

[Timewarp-commit] source/other ttf.cpp,1.4,1.5 ttf.h,1.2,1.3

[Rob <geo...@us...>]

Update of /cvsroot/timewarp/source/other
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5786/other

Modified Files:
	ttf.cpp ttf.h 
Log Message:
unknown crash for ttf when called destroy_font, no solution yet

Index: ttf.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/other/ttf.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ttf.cpp	24 Mar 2004 23:51:43 -0000	1.4
--- ttf.cpp	26 Mar 2004 16:55:43 -0000	1.5
***************
*** 74,77 ****
--- 74,105 ----
  
  
+ 
+ 
+ 
+ // for debugging (copied from allegro)
+ static void color_destroy_font(FONT* f)
+ {
+     FONT_COLOR_DATA* cf;
+ 
+     if(!f) return;
+ 
+     cf = (FONT_COLOR_DATA*)(f->data);
+ 
+     while(cf) {
+         FONT_COLOR_DATA* next = cf->next;
+         int i = 0;
+ 
+         for(i = cf->begin; i < cf->end; i++) destroy_bitmap(cf->bitmaps[i - cf->begin]);
+ 
+         free(cf->bitmaps);
+         free(cf);
+ 
+         cf = next;
+     }
+ 
+     free(f);
+ }
+ 
+ 
  FONT* load_ttf_font (const char* filename, const int points, const int smooth)
  {
***************
*** 134,138 ****
  	int c;
  	
! 	AL_CONST int num = end - begin + 1;
  	
  	struct FONT *f;
--- 162,167 ----
  	int c;
  	
! 	AL_CONST int num = end - begin;
! 	// NOTE: static void color_destroy(FONT* f)  destroys bitmaps >=begin, <end
  	
  	struct FONT *f;
***************
*** 141,153 ****
  	// Allocate and setup the Allegro font
  	// (copied from allegttf)
! 	f = (struct FONT*)calloc(1,sizeof(struct FONT));
! 	fcd = (struct FONT_COLOR_DATA*)calloc(1,sizeof(struct FONT_COLOR_DATA));
  	fcd->begin = begin;
  	fcd->end = end;
! 	fcd->bitmaps = (BITMAP**)calloc(num,sizeof(BITMAP*));
  	fcd->next = NULL;
  	f->data = (void*)fcd;
  	f->vtable = font_vtable_color;
  	
  
  
--- 170,186 ----
  	// Allocate and setup the Allegro font
  	// (copied from allegttf)
! 	f = (struct FONT*) calloc(1,sizeof(struct FONT));
! 	fcd = (struct FONT_COLOR_DATA*) calloc(1,sizeof(struct FONT_COLOR_DATA));
  	fcd->begin = begin;
  	fcd->end = end;
! 	fcd->bitmaps = (BITMAP**) calloc(num,sizeof(BITMAP*));
  	fcd->next = NULL;
  	f->data = (void*)fcd;
  	f->vtable = font_vtable_color;
  	
+ 	//f->vtable->destroy = &color_destroy_font;
+ 	// STRANGE, this is needed to avoid a crash ?!?!
+ 	// WHY ???
+ 	
  
  
***************
*** 165,169 ****
  	
  	//char c;
! 	for ( c = begin; c <= end; ++c )
  	{
  		// load glyph image into the slot (erase previous one)
--- 198,202 ----
  	
  	//char c;
! 	for ( c = begin; c < end; ++c )		// not <= end !!
  	{
  		// load glyph image into the slot (erase previous one)
***************
*** 174,178 ****
  		
  		// now, draw to our target surface
- 		BITMAP *bmp = 0;
  		int w, h;
  
--- 207,210 ----
***************
*** 188,191 ****
--- 220,224 ----
  		dy = yorigin - slot->bitmap_top;
  
+ 		BITMAP *bmp = 0;
  		if (w && h)
  		{
***************
*** 213,214 ****
--- 246,299 ----
  
  
+ 
+ FONT* load_font_test (const int points)
+ {
+ 	int w, h, begin, end;
+ 	begin = 32;	// space character
+ 	end = 128;	// ?
+ 	w = points;
+ 	h = points;
+ 
+ 	int c;
+ 	
+ 	AL_CONST int num = end - begin;
+ 	// NOTE: static void color_destroy(FONT* f)  destroys bitmaps >=begin, <end
+ 	
+ 	struct FONT *f;
+ 	struct FONT_COLOR_DATA *fcd;
+ 	
+ 	// Allocate and setup the Allegro font
+ 	// (copied from allegttf)
+ 	f = (struct FONT*) calloc(1,sizeof(struct FONT));
+ 	fcd = (struct FONT_COLOR_DATA*) calloc(1,sizeof(struct FONT_COLOR_DATA));
+ 	fcd->begin = begin;
+ 	fcd->end = end;
+ 	fcd->bitmaps = (BITMAP**) calloc(num,sizeof(BITMAP*));
+ 	fcd->next = NULL;
+ 	f->data = (void*)fcd;
+ 	f->vtable = font_vtable_color;
+ 	
+ //	f->vtable->destroy = &color_destroy_font;
+ 	// STRANGE, this is needed to avoid a crash ?!?!
+ 	// WHY ???
+ 	
+ 
+ 	//char c;
+ 	for ( c = begin; c < end; ++c )		// not <= end !!
+ 	{		
+ 		BITMAP *bmp = 0;
+ 
+ 		bmp = create_bitmap_ex(8, w, h);
+ 		clear_to_color(bmp, 0);
+ 			
+ 		fcd->bitmaps[c-begin] = bmp;
+ 	}
+ 
+ 	
+ 	// set the font height
+ 	f->height = h;
+ 	
+ 	return f;
+    }
+    
+    

Index: ttf.h
===================================================================
RCS file: /cvsroot/timewarp/source/other/ttf.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ttf.h	24 Mar 2004 23:51:44 -0000	1.2
--- ttf.h	26 Mar 2004 16:55:43 -0000	1.3
***************
*** 5,8 ****
--- 5,11 ----
  
  FONT* load_ttf_font (const char* filename, const int points, const int smooth);
+ FONT* load_font_test (const int points);
+ 
+ void color_destroy_font(FONT* f);
  
  #endif