Menu
▾
▴
timewarp-commit — Shows each and every CVS commit - high volume
You can subscribe to this list here.
| 2003 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(136) |
Dec
(218) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2004 |
Jan
(214) |
Feb
(208) |
Mar
(186) |
Apr
(15) |
May
(3) |
Jun
(35) |
Jul
(6) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2005 |
Jan
(1) |
Feb
|
Mar
(1) |
Apr
|
May
|
Jun
|
Jul
(58) |
Aug
(123) |
Sep
(31) |
Oct
(9) |
Nov
|
Dec
(1) |
| 2006 |
Jan
(25) |
Feb
(10) |
Mar
(25) |
Apr
(61) |
May
|
Jun
(78) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2007 |
Jan
|
Feb
|
Mar
|
Apr
(12) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2011 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(10) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2013 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(1) |
Dec
|
| 2014 |
Jan
|
Feb
|
Mar
(1) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
Update of /cvsroot/timewarp/source/Timewarp In directory vz-cvs-2.sog:/tmp/cvs-serv7398 Added Files: Timewarp.sdf Timewarp.sln Timewarp.suo Timewarp.vcxproj Timewarp.vcxproj.filters Timewarp.vcxproj.user Timewarp_manifest.rc Log Message: no message --- NEW FILE: Timewarp_manifest.rc --- (This appears to be a binary file; contents omitted.) --- NEW FILE: Timewarp.sdf --- (This appears to be a binary file; contents omitted.) --- NEW FILE: Timewarp.suo --- (This appears to be a binary file; contents omitted.) --- NEW FILE: Timewarp.vcxproj --- (This appears to be a binary file; contents omitted.) --- NEW FILE: Timewarp.vcxproj.user --- (This appears to be a binary file; contents omitted.) --- NEW FILE: Timewarp.sln --- (This appears to be a binary file; contents omitted.) --- NEW FILE: Timewarp.vcxproj.filters --- (This appears to be a binary file; contents omitted.) |
|
From: Rob <geo...@us...> - 2011-07-03 13:13:02
|
Update of /cvsroot/timewarp/source/include
In directory vz-cvs-2.sog:/tmp/cvs-serv7215
Added Files:
alfont.h alfontdll.h allegro.h bealleg.h ft2build.h jgmod.h
linalleg.h macalleg.h osxalleg.h qnxalleg.h winalleg.h
xalleg.h
Log Message:
no message
--- NEW FILE: bealleg.h ---
/* ______ ___ ___
* /\ _ \ /\_ \ /\_ \
* \ \ \L\ \\//\ \ \//\ \ __ __ _ __ ___
* \ \ __ \ \ \ \ \ \ \ /'__`\ /'_ `\/\`'__\/ __`\
* \ \ \/\ \ \_\ \_ \_\ \_/\ __//\ \L\ \ \ \//\ \L\ \
* \ \_\ \_\/\____\/\____\ \____\ \____ \ \_\\ \____/
* \/_/\/_/\/____/\/____/\/____/\/___L\ \/_/ \/___/
* /\____/
* \_/__/
*
* The Be Allegro Header File.
*
* Aren't you glad you used the BeOS header file?
* Don't you wish everybody did?
*
* By Jason Wilkins.
*
* See readme.txt for copyright information.
*/
#ifndef BE_ALLEGRO_H
#define BE_ALLEGRO_H
/* There is namespace cross-talk between the Be API and
Allegro, lets use my favorite namespace detergent.
"Kludge!" Now with 25% more hack. */
#ifdef __cplusplus
# define color_map al_color_map
# define drawing_mode al_drawing_mode
#endif
#include "allegro.h"
#include "allegro/internal/aintern.h"
#ifdef __cplusplus
# undef color_map
# undef drawing_mode
# undef MIN
# undef MAX
# undef TRACE
# undef ASSERT
#ifdef DEBUGMODE
# define AL_ASSERT(condition) { if (!(condition)) al_assert(__FILE__, __LINE__); }
#else
# define AL_ASSERT(condition)
#endif
#ifndef SCAN_DEPEND
#include <Be.h>
#endif
#define BE_ALLEGRO_VIEW_DIRECT 1
#define BE_ALLEGRO_VIEW_OVERLAY 2
#define LINE8_HOOK_NUM 3
#define LINE16_HOOK_NUM 12
#define LINE32_HOOK_NUM 4
#define ARRAY8_HOOK_NUM 8
#define ARRAY32_HOOK_NUM 9
#define RECT8_HOOK_NUM 5
#define RECT16_HOOK_NUM 16
#define RECT32_HOOK_NUM 6
#define INVERT_HOOK_NUM 11
#define BLIT_HOOK_NUM 7
#define SYNC_HOOK_NUM 10
typedef int32 (*LINE8_HOOK)(int32 startX, int32 endX, int32 startY,
int32 endY, uint8 colorIndex, bool clipToRect, int16 clipLeft,
int16 clipTop, int16 clipRight, int16 clipBottom);
typedef int32 (*ARRAY8_HOOK)(indexed_color_line *array,
int32 numItems, bool clipToRect, int16 top, int16 right,
int16 bottom, int16 left);
typedef int32 (*LINE16_HOOK)(int32 startX, int32 endX, int32 startY,
int32 endY, uint16 color, bool clipToRect, int16 clipLeft,
int16 clipTop, int16 clipRight, int16 clipBottom);
typedef int32 (*LINE32_HOOK)(int32 startX, int32 endX, int32 startY,
int32 endY, uint32 color, bool clipToRect, int16 clipLeft,
int16 clipTop, int16 clipRight, int16 clipBottom);
typedef int32 (*ARRAY32_HOOK)(rgb_color_line *array,
int32 numItems, bool clipToRect, int16 top, int16 right,
int16 bottom, int16 left);
typedef int32 (*RECT8_HOOK)(int32 left, int32 top, int32 right,
int32 bottom, uint8 colorIndex);
typedef int32 (*RECT16_HOOK)(int32 left, int32 top, int32 right,
int32 bottom, uint16 color);
typedef int32 (*RECT32_HOOK)(int32 left, int32 top, int32 right,
int32 bottom, uint32 color);
typedef int32 (*INVERT_HOOK)(int32 left, int32 top, int32 right,
int32 bottom);
typedef int32 (*BLIT_HOOK)(int32 sourceX, int32 sourceY,
int32 destinationX, int32 destinationY, int32 width,
int32 height);
typedef int32 (*SYNC_HOOK)(void);
typedef struct HOOKS {
LINE8_HOOK draw_line_8;
LINE16_HOOK draw_line_16;
LINE32_HOOK draw_line_32;
ARRAY8_HOOK draw_array_8;
ARRAY32_HOOK draw_array_32;
RECT8_HOOK draw_rect_8;
RECT16_HOOK draw_rect_16;
RECT32_HOOK draw_rect_32;
INVERT_HOOK invert_rect;
BLIT_HOOK blit;
SYNC_HOOK sync;
} HOOKS;
typedef struct {
int d, w, h;
uint32 mode;
uint32 space;
} BE_MODE_TABLE;
class BeAllegroView
: public BView
{
public:
BeAllegroView(BRect, const char *, uint32, uint32, int);
void MessageReceived(BMessage *);
void Draw(BRect);
private:
int flags;
};
class BeAllegroWindow
: public BWindow
{
public:
BeAllegroWindow(BRect, const char *, window_look, window_feel, uint32, uint32, uint32, uint32, uint32);
~BeAllegroWindow();
void MessageReceived(BMessage *);
bool QuitRequested(void);
void WindowActivated(bool);
int screen_depth;
int screen_width;
int screen_height;
BBitmap *buffer;
BBitmap *aux_buffer;
bool dying;
thread_id drawing_thread_id;
};
class BeAllegroDirectWindow
: public BDirectWindow
{
public:
BeAllegroDirectWindow(BRect, const char *, window_look, window_feel, uint32, uint32, uint32, uint32, uint32);
~BeAllegroDirectWindow();
void DirectConnected(direct_buffer_info *);
void MessageReceived(BMessage *);
bool QuitRequested(void);
void WindowActivated(bool);
void *screen_data;
uint32 screen_pitch;
uint32 screen_height;
uint32 screen_depth;
void *display_data;
uint32 display_pitch;
uint32 display_depth;
uint32 num_rects;
clipping_rect *rects;
clipping_rect window;
COLORCONV_BLITTER_FUNC *blitter;
bool connected;
bool dying;
BLocker *locker;
thread_id drawing_thread_id;
};
class BeAllegroScreen
: public BWindowScreen
{
public:
BeAllegroScreen(const char *title, uint32 space, status_t *error, bool debugging = false);
void MessageReceived(BMessage *);
bool QuitRequested(void);
void ScreenConnected(bool connected);
};
class BeAllegroOverlay
: public BWindow
{
public:
BeAllegroOverlay(BRect, const char *, window_look, window_feel, uint32, uint32, uint32, uint32, uint32);
~BeAllegroOverlay();
void MessageReceived(BMessage *);
bool QuitRequested(void);
void WindowActivated(bool);
BBitmap *buffer;
rgb_color color_key;
};
class BeAllegroApp
: public BApplication
{
public:
BeAllegroApp(const char *signature);
bool QuitRequested(void);
void ReadyToRun(void);
};
AL_VAR(BeAllegroApp, *_be_allegro_app);
AL_VAR(BeAllegroWindow, *_be_allegro_window);
AL_VAR(BeAllegroDirectWindow, *_be_allegro_direct_window);
AL_VAR(BeAllegroView, *_be_allegro_view);
AL_VAR(BeAllegroScreen, *_be_allegro_screen);
AL_VAR(BeAllegroOverlay, *_be_allegro_overlay);
AL_VAR(BWindow, *_be_window);
AL_VAR(BMidiSynth, *_be_midisynth);
AL_VAR(sem_id, _be_sound_stream_lock);
AL_VAR(sem_id, _be_fullscreen_lock);
AL_VAR(sem_id, _be_window_lock);
AL_VAR(sem_id, _be_mouse_view_attached);
AL_VAR(BWindow, *_be_mouse_window);
AL_VAR(BView, *_be_mouse_view);
AL_VAR(int, _be_mouse_z);
AL_VAR(bool, _be_mouse_window_mode);
AL_VAR(HOOKS, _be_hooks);
AL_VAR(int, _be_switch_mode);
AL_VAR(volatile int, _be_lock_count);
AL_VAR(volatile int, _be_focus_count);
AL_VAR(volatile bool, _be_gfx_initialized);
AL_VAR(int, *_be_dirty_lines);
AL_ARRAY(AL_CONST BE_MODE_TABLE, _be_mode_table);
extern int32 (*_be_sync_func)();
extern void (*_be_window_close_hook)();
void _be_terminate(thread_id caller, bool exit_caller);
void _be_gfx_set_truecolor_shifts();
void _be_change_focus(bool active);
bool _be_handle_window_close(const char *title);
#endif /* ifdef C++ */
#endif /* ifndef BE_ALLEGRO_H */
--- NEW FILE: winalleg.h ---
/* ______ ___ ___
* /\ _ \ /\_ \ /\_ \
* \ \ \L\ \\//\ \ \//\ \ __ __ _ __ ___
* \ \ __ \ \ \ \ \ \ \ /'__`\ /'_ `\/\`'__\/ __`\
* \ \ \/\ \ \_\ \_ \_\ \_/\ __//\ \L\ \ \ \//\ \L\ \
* \ \_\ \_\/\____\/\____\ \____\ \____ \ \_\\ \____/
* \/_/\/_/\/____/\/____/\/____/\/___L\ \/_/ \/___/
* /\____/
* \_/__/
*
* Windows header file for the Allegro library.
*
* It must be included by Allegro programs that need to use
* direct Win32 API calls and by Win32 programs that need to
* interface with Allegro.
*
* By Shawn Hargreaves.
*
* See readme.txt for copyright information.
*/
#ifndef WIN_ALLEGRO_H
#define WIN_ALLEGRO_H
#ifndef ALLEGRO_H
#error Please include allegro.h before winalleg.h!
#endif
#ifdef ALLEGRO_SRC
#define WIN32_LEAN_AND_MEAN /* to save compilation time */
#endif
/* bodges to avoid conflicts between Allegro and Windows */
#define BITMAP WINDOWS_BITMAP
#if (!defined SCAN_EXPORT) && (!defined SCAN_DEPEND)
#ifdef ALLEGRO_AND_MFC
#ifdef DEBUGMODE
#define AL_ASSERT(condition) { if (!(condition)) al_assert(__FILE__, __LINE__); }
#define AL_TRACE al_trace
#else
#define AL_ASSERT(condition)
#define AL_TRACE 1 ? (void) 0 : al_trace
#endif
#undef TRACE
#undef ASSERT
#include <afxwin.h>
#else
#include <windows.h>
#endif
#endif
#define WINDOWS_RGB(r,g,b) ((COLORREF)(((BYTE)(r)|((WORD)((BYTE)(g))<<8))|(((DWORD)(BYTE)(b))<<16)))
#undef BITMAP
#undef RGB
/* Allegro's Win32 specific interface */
#ifdef __cplusplus
extern "C" {
#endif
/* external graphics driver support */
typedef struct WIN_GFX_DRIVER {
int has_backing_store;
AL_METHOD(void, switch_in, (void));
AL_METHOD(void, switch_out, (void));
AL_METHOD(void, enter_sysmode, (void));
AL_METHOD(void, exit_sysmode, (void));
AL_METHOD(void, move, (int x, int y, int w, int h));
AL_METHOD(void, iconify, (void));
AL_METHOD(void, paint, (RECT *rect));
} WIN_GFX_DRIVER;
AL_VAR(WIN_GFX_DRIVER *, win_gfx_driver);
AL_FUNC(void, win_grab_input, (void));
/* external window support */
AL_FUNC(HWND, win_get_window, (void));
AL_FUNC(void, win_set_window, (HWND wnd));
AL_FUNC(void, win_set_wnd_create_proc, (AL_METHOD(HWND, proc, (WNDPROC))));
/* GDI to DirectDraw routines */
AL_FUNC(HDC, win_get_dc, (BITMAP *bmp));
AL_FUNC(void, win_release_dc, (BITMAP *bmp, HDC dc));
/* GDI routines */
AL_FUNC(void, set_gdi_color_format, (void));
AL_FUNC(void, set_palette_to_hdc, (HDC dc, PALETTE pal));
AL_FUNC(HPALETTE, convert_palette_to_hpalette, (PALETTE pal));
AL_FUNC(void, convert_hpalette_to_palette, (HPALETTE hpal, PALETTE pal));
AL_FUNC(HBITMAP, convert_bitmap_to_hbitmap, (BITMAP *bitmap));
AL_FUNC(BITMAP *, convert_hbitmap_to_bitmap, (HBITMAP bitmap));
AL_FUNC(void, draw_to_hdc, (HDC dc, BITMAP *bitmap, int x, int y));
AL_FUNC(void, blit_to_hdc, (BITMAP *bitmap, HDC dc, int src_x, int src_y, int dest_x, int dest_y, int w, int h));
AL_FUNC(void, stretch_blit_to_hdc, (BITMAP *bitmap, HDC dc, int src_x, int src_y, int src_w, int src_h, int dest_x, int dest_y, int dest_w, int dest_h));
AL_FUNC(void, blit_from_hdc, (HDC dc, BITMAP *bitmap, int src_x, int src_y, int dest_x, int dest_y, int w, int h));
AL_FUNC(void, stretch_blit_from_hdc, (HDC hdc, BITMAP *bitmap, int src_x, int src_y, int src_w, int src_h, int dest_x, int dest_y, int dest_w, int dest_h));
#ifdef __cplusplus
}
#endif
#endif /* ifndef WIN_ALLEGRO_H */
--- NEW FILE: linalleg.h ---
/* ______ ___ ___
* /\ _ \ /\_ \ /\_ \
* \ \ \L\ \\//\ \ \//\ \ __ __ _ __ ___
* \ \ __ \ \ \ \ \ \ \ /'__`\ /'_ `\/\`'__\/ __`\
* \ \ \/\ \ \_\ \_ \_\ \_/\ __//\ \L\ \ \ \//\ \L\ \
* \ \_\ \_\/\____\/\____\ \____\ \____ \ \_\\ \____/
* \/_/\/_/\/____/\/____/\/____/\/___L\ \/_/ \/___/
* /\____/
* \_/__/
*
* Linux header file for the Allegro library.
*
* This file no longer contains anything. At the moment,
* it exists only for backwards compatibility.
*
* See readme.txt for copyright information.
*/
#ifndef LIN_ALLEGRO_H
#define LIN_ALLEGRO_H
/*
* THIS IS AN EX-PARROT!!
*/
#endif /* ifndef LIN_ALLEGRO_H */
--- NEW FILE: jgmod.h ---
#ifndef JGMOD_H
#define JGMOD_H
#ifndef JGM_ID
#define JGM_ID DAT_ID('J','G','M',' ')
#endif
#ifndef null
#define null 0
#endif
#ifndef uchar
#define uchar unsigned char
#endif
#ifndef ushort
#define ushort unsigned short
#endif
#ifndef uint
#define uint unsigned int
#endif
#ifndef NULL
#define NULL 0
#endif
#ifndef TRUE
#define TRUE -1
#endif
#ifndef FALSE
#define FALSE 0
#endif
//#ifndef __ALLEG_WIN32__
// #ifndef DJGPP
// #error DJGPP compiler is needed to compile this library. Go to
// #error www.delorie.com for more info
// #endif
//#endif
//#ifndef ALLEGRO_H
//#error JGMOD can only be used with Allegro library. Go to
//#error www.talula.demon.co.uk/allegro
//#endif
#ifdef __cplusplus
extern "C" {
#endif
#define JGMOD_AUTHOR "Guan Foo Wah"
#define JGMOD_VERSION 0
#define JGMOD_SUB_VERSION 99
#define JGMOD_VERSION_STR "0.99"
#define JGMOD_DATE_STR "19 April 2001"
#define JGMOD_DATE 20010419 /* yyyymmdd */
#define NTSC 3579546L
#define JGMOD_PRIORITY 192
#define MAX_ALLEG_VOICE 64
#define LOOP_OFF 0
#define LOOP_ON 1
#define LOOP_BIDI 2
#define ENV_ON 1
#define ENV_SUS 2
#define ENV_LOOP 4
#define XM_MODE 1
#define PERIOD_MODE 2
#define LINEAR_MODE 4
#define PTEFFECT_0 0
#define PTEFFECT_1 1
#define PTEFFECT_2 2
#define PTEFFECT_3 3
#define PTEFFECT_4 4
#define PTEFFECT_5 5
#define PTEFFECT_6 6
#define PTEFFECT_7 7
#define PTEFFECT_8 8
#define PTEFFECT_9 9
#define PTEFFECT_A 10
#define PTEFFECT_B 11
#define PTEFFECT_C 12
#define PTEFFECT_D 13
#define PTEFFECT_E 14
#define PTEFFECT_F 15
#define S3EFFECT_A 16
#define S3EFFECT_D 17
#define S3EFFECT_E 18
#define S3EFFECT_F 19
#define S3EFFECT_I 20
#define S3EFFECT_J 21
#define S3EFFECT_K 22
#define S3EFFECT_L 23
#define S3EFFECT_Q 24
#define S3EFFECT_R 25
#define S3EFFECT_T 26
#define S3EFFECT_U 27
#define S3EFFECT_V 28
#define S3EFFECT_X 29
#define XMEFFECT_1 30
#define XMEFFECT_2 31
#define XMEFFECT_5 32
#define XMEFFECT_6 33
#define XMEFFECT_A 34
#define XMEFFECT_H 35
#define XMEFFECT_K 36
#define XMEFFECT_L 37
#define XMEFFECT_P 38
#define XMEFFECT_X 39
//this is used in get_mod_info() function.
#define MOD15_TYPE 1
#define MOD31_TYPE 2
#define S3M_TYPE 3
#define XM_TYPE 4
#define IT_TYPE 5
#define JGM_TYPE 6
#define UNREAL_S3M_TYPE 7
#define UNREAL_XM_TYPE 8
#define UNREAL_IT_TYPE 9
//-- Header ------------------------------------------------------------------
typedef struct ENVELOPE_INFO
{
int env[12];
int pos[12];
int flg;
int pts;
int loopbeg;
int loopend;
int susbeg;
int susend;
int a;
int b;
int p;
int v;
}ENVELOPE_INFO;
typedef struct CHANNEL_INFO
{
ENVELOPE_INFO volenv;
ENVELOPE_INFO panenv;
int instrument;
int sample;
int volume;
int note;
int period;
int c2spd;
int transpose;
int pan;
int kick; // TRUE if sample needs to be restarted
int keyon;
int volfade; // volume fadeout
int instfade; // how much volume to subtract from volfade
int temp_volume;
int temp_period;
int temp_pan;
int pan_slide_common;
int pan_slide;
int pan_slide_left;
int pan_slide_right;
int pro_pitch_slide_on;
int pro_pitch_slide;
int pro_fine_pitch_slide;
int s3m_pitch_slide_on;
int s3m_pitch_slide;
int s3m_fine_pitch_slide;
int xm_pitch_slide_up_on;
int xm_pitch_slide_up;
int xm_pitch_slide_down_on;
int xm_pitch_slide_down;
int xm_fine_pitch_slide_up;
int xm_fine_pitch_slide_down;
int xm_extra_fine_pitch_slide_up;
int xm_x_up;
int xm_x_down;
int pro_volume_slide;
int s3m_volume_slide_on;
int s3m_fine_volume_slide;
int s3m_volume_slide;
int xm_volume_slide_on;
int xm_volume_slide;
int xm_fine_volume_slide_up;
int xm_fine_volume_slide_down;
int loop_on;
int loop_times;
int loop_start;
int tremolo_on;
int tremolo_waveform;
char tremolo_pointer;
int tremolo_speed;
int tremolo_depth;
int tremolo_shift;
int vibrato_on;
int vibrato_waveform;
char vibrato_pointer;
int vibrato_speed;
int vibrato_depth;
int vibrato_shift;
int slide2period_on;
int slide2period_spd;
int slide2period;
int arpeggio_on;
int arpeggio;
int tremor_on;
int tremor_count;
int tremor_set;
int delay_sample;
int cut_sample;
int glissando;
int retrig;
int s3m_retrig_on;
int s3m_retrig;
int s3m_retrig_slide;
int sample_offset_on;
int sample_offset;
int global_volume_slide_on;
int global_volume_slide;
}CHANNEL_INFO;
typedef struct MUSIC_INFO
{
int max_chn;
int no_chn;
int tick;
int pos;
int pat;
int trk;
int flag;
int bpm;
int tempo;
int speed_ratio;
int pitch_ratio;
int global_volume;
int new_pos; // for pattern break
int new_trk; // or position jump
int pattern_delay; // pattern delay
int skip_pos; // for next_pattern
int skip_trk; // or prev_pattern
int loop; // replay the music if ended
int pause; // for pause function
int forbid;
int is_playing;
}MUSIC_INFO;
typedef struct NOTE_INFO
{
int sample;
int note;
int volume;
int command;
int extcommand;
}NOTE_INFO;
typedef struct SAMPLE_INFO
{
int lenght;
int c2spd;
int transpose;
int volume;
int pan;
int repoff;
int replen;
int loop;
int vibrato_type;
int vibrato_spd;
int vibrato_depth;
int vibrato_rate;
}SAMPLE_INFO;
typedef struct INSTRUMENT_INFO
{
int sample_number[96];
int volenv[12];
int volpos[12];
int no_volenv;
int vol_type;
int vol_susbeg;
int vol_susend;
int vol_begin;
int vol_end;
int panenv[12];
int panpos[12];
int no_panenv;
int pan_type;
int pan_susbeg;
int pan_susend;
int pan_begin;
int pan_end;
int volume_fadeout;
}INSTRUMENT_INFO;
typedef struct PATTERN_INFO
{
NOTE_INFO *ni;
int no_pos;
}PATTERN_INFO;
typedef struct JGMOD
{
char name[29];
SAMPLE_INFO *si;
PATTERN_INFO *pi;
INSTRUMENT_INFO *ii;
SAMPLE *s;
int no_trk;
int no_pat;
int pat_table[256];
int panning[MAX_ALLEG_VOICE];
int flag;
int tempo;
int bpm;
int restart_pos;
int no_chn;
int no_instrument;
int no_sample;
int global_volume;
}JGMOD;
typedef struct JGMOD_INFO
{
int type;
char type_name[20];
char name[29];
}JGMOD_INFO;
//-- externs -----------------------------------------------------------------
extern JGMOD *of;
extern volatile MUSIC_INFO mi;
extern volatile int voice_table[];
extern volatile CHANNEL_INFO ci[MAX_ALLEG_VOICE];
extern volatile int mod_volume;
extern int fast_loading;
extern int enable_m15;
extern int enable_lasttrk_loop;
extern char jgmod_error[];
//-- Prototypes --------------------------------------------------------------
int install_mod(int no_voices);
void remove_mod (void);
JGMOD *load_mod (char *filename);
void mod_interrupt (void);
void play_mod (JGMOD *j, int loop);
void next_mod_track (void);
void prev_mod_track (void);
void goto_mod_track (int new_track);
void stop_mod (void);
int is_mod_playing (void);
void pause_mod (void);
void resume_mod (void);
int is_mod_paused (void);
void destroy_mod (JGMOD *j);
void set_mod_volume (int volume);
int get_mod_volume (void);
SAMPLE *get_jgmod_sample (JGMOD *j, int sample_no);
void set_mod_speed (int speed);
void set_mod_pitch (int pitch);
void toggle_pause_mode (void);
void register_datafile_jgmod(void);
void destroy_mod_datafile(void *j);
int get_mod_info (char *filename, JGMOD_INFO *ji);
#ifdef __cplusplus
}
#endif
#endif // for JGMOD_H
--- NEW FILE: xalleg.h ---
/* ______ ___ ___
* /\ _ \ /\_ \ /\_ \
* \ \ \L\ \\//\ \ \//\ \ __ __ _ __ ___
* \ \ __ \ \ \ \ \ \ \ /'__`\ /'_ `\/\`'__\/ __`\
* \ \ \/\ \ \_\ \_ \_\ \_/\ __//\ \L\ \ \ \//\ \L\ \
* \ \_\ \_\/\____\/\____\ \____\ \____ \ \_\\ \____/
* \/_/\/_/\/____/\/____/\/____/\/___L\ \/_/ \/___/
* /\____/
* \_/__/
*
* X header file for the Allegro library.
*
* This prototypes some things which might be useful to
* the calling application, but you don't need it.
*/
#ifndef X_ALLEGRO_H
#define X_ALLEGRO_H
#ifndef ALLEGRO_H
#error Please include allegro.h before xalleg.h!
#endif
#include "allegro/internal/aintern.h"
#include "allegro/platform/aintunix.h"
#include <string.h>
#include <X11/Xlib.h>
#include <X11/Xutil.h>
#include <X11/cursorfont.h>
#include <X11/keysym.h>
#ifdef ALLEGRO_XWINDOWS_WITH_SHM
#include <sys/ipc.h>
#include <sys/shm.h>
#include <X11/extensions/XShm.h>
#endif
#ifdef ALLEGRO_XWINDOWS_WITH_XF86VIDMODE
#include <X11/extensions/xf86vmode.h>
#endif
#ifdef ALLEGRO_XWINDOWS_WITH_XCURSOR
#include <X11/Xcursor/Xcursor.h>
#endif
#ifdef __cplusplus
extern "C" {
#endif
/* X-Windows resources used by the library. */
extern struct _xwin_type
{
Display *display;
volatile int lock_count;
int screen;
Window window;
GC gc;
Visual *visual;
Colormap colormap;
XImage *ximage;
#ifdef ALLEGRO_XWINDOWS_WITH_XCURSOR
XcursorImage *xcursor_image;
XcursorBool support_argb_cursor;
#endif
Cursor cursor;
int cursor_shape;
int hw_cursor_ok;
void (*screen_to_buffer)(int sx, int sy, int sw, int sh);
void (*set_colors)(AL_CONST PALETTE p, int from, int to);
unsigned char *screen_data;
unsigned char **screen_line;
unsigned char **buffer_line;
int scroll_x;
int scroll_y;
int window_width;
int window_height;
int window_depth;
int screen_width;
int screen_height;
int screen_depth;
int virtual_width;
int virtual_height;
int mouse_warped;
int keycode_to_scancode[256];
int matching_formats;
int fast_visual_depth;
int visual_is_truecolor;
int rsize;
int gsize;
int bsize;
int rshift;
int gshift;
int bshift;
unsigned long cmap[0x1000];
unsigned long rmap[0x100];
unsigned long gmap[0x100];
unsigned long bmap[0x100];
#ifdef ALLEGRO_XWINDOWS_WITH_SHM
XShmSegmentInfo shminfo;
#endif
int use_shm;
int in_dga_mode; /* 0=no, 2=DGA2 */
int keyboard_grabbed;
int mouse_grabbed;
#ifdef ALLEGRO_XWINDOWS_WITH_XF86VIDMODE
XF86VidModeModeInfo **modesinfo;
int num_modes;
int mode_switched;
int override_redirected;
#endif
char window_title[1024];
char application_name[1024];
char application_class[1024];
int drawing_mode_ok;
#ifdef ALLEGRO_MULTITHREADED
void *mutex;
#endif
void (*close_button_callback)(void);
} _xwin;
AL_FUNCPTR (int, _xwin_window_creator, (void));
AL_FUNCPTR (void, _xwin_window_defaultor, (void));
AL_FUNCPTR (void, _xwin_window_redrawer, (int, int, int, int));
AL_FUNCPTR (void, _xwin_input_handler, (void));
AL_FUNCPTR (void, _xwin_keyboard_callback, (int, int));
AL_FUNC(void, xwin_set_window_name, (AL_CONST char *name, AL_CONST char *group));
#ifdef __cplusplus
}
#endif
#endif
--- NEW FILE: macalleg.h ---
/* ______ ___ ___
* /\ _ \ /\_ \ /\_ \
* \ \ \L\ \\//\ \ \//\ \ __ __ _ __ ___
* \ \ __ \ \ \ \ \ \ \ /'__`\ /'_ `\/\`'__\/ __`\
* \ \ \/\ \ \_\ \_ \_\ \_/\ __//\ \L\ \ \ \//\ \L\ \
* \ \_\ \_\/\____\/\____\ \____\ \____ \ \_\\ \____/
* \/_/\/_/\/____/\/____/\/____/\/___L\ \/_/ \/___/
* /\____/
* \_/__/
*
* MacOs header file for the Allegro library.
* This should be included by everyone and everything.
*
* By Ronaldo Hideki Yamada.
*
* See readme.txt for copyright information.
*/
#ifndef MAC_ALLEGRO_H
#define MAC_ALLEGRO_H
#ifndef ALLEGRO_H
#error Please include allegro.h before macalleg.h!
#endif
#if (!defined SCAN_EXPORT) && (!defined SCAN_DEPEND)
#endif
#include <MacTypes.h> //theses includes aways are needed in normal mac programs
#include <Quickdraw.h>
#include <Fonts.h>
#include <Windows.h>
#include <Controls.h>
#include <Menus.h>
#include <TextEdit.h>
#include <Dialogs.h>
#include <Devices.h>
#include <Events.h>
#include <Scrap.h>
#include <Errors.h>
#include <errno.h>
#include <Script.h>
#include <Memory.h>
#include <Events.h>
#include <Sound.h>
#include <ToolUtils.h>
#include <TextUtils.h>
#include <NumberFormatting.h>
#include <FixMath.h>
#include <fp.h>
#include <Traps.h>
#include <stdio.h>
#include <Files.h>
#include <StandardFile.h>
#include <Timer.h>
#include <DrawSprocket.h>
#include <Sound.h>
#include "allegro/platform/macdef.h"
#ifdef __cplusplus
extern "C" {
#endif
typedef BITMAP BITMAP;
typedef struct{
CGrafPtr cg;
long rowBytes;
unsigned char* first;
unsigned char* last;
long flags;
int cachealigned;
Ptr data;
}mac_bitmap;
#define MEMORY_ALIGN 4
#define GETMACBITMAP(bmp)((mac_bitmap*)(bmp->extra))
#pragma options align=mac68k
typedef struct mac_sample{
short formatType;
short numberSyns;
short idFirstSynth;
long INIToptions;
short numCommands;
short command1;
short param1;
long param2;
SoundHeader s;
}mac_sample;
typedef mac_sample **hmac_sample;
#pragma options align=reset
typedef struct mac_voice{
SndChannelPtr channel;
SndListHandle sample;
short headsize;
long headeroff;
int loop;
int loop_start;
int loop_end;
int vol;
int pan;
int frequency;
SAMPLE * al_sample;
}mac_voice;
AL_VAR(QDGlobals , qd);
AL_VAR(GFX_VTABLE,__mac_sys_vtable8);
AL_VAR(GFX_VTABLE,__mac_sys_vtable15);
AL_VAR(GFX_VTABLE,__mac_sys_vtable24);
extern void _mac_lock(void *address, unsigned long size);
extern void _mac_unlock(void *address, unsigned long size);
#ifdef __cplusplus
}
#endif
#endif /* ifndef MAC_ALLEGRO_H */
--- 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: osxalleg.h ---
/* ______ ___ ___
* /\ _ \ /\_ \ /\_ \
* \ \ \L\ \\//\ \ \//\ \ __ __ _ __ ___
* \ \ __ \ \ \ \ \ \ \ /'__`\ /'_ `\/\`'__\/ __`\
* \ \ \/\ \ \_\ \_ \_\ \_/\ __//\ \L\ \ \ \//\ \L\ \
* \ \_\ \_\/\____\/\____\ \____\ \____ \ \_\\ \____/
* \/_/\/_/\/____/\/____/\/____/\/___L\ \/_/ \/___/
* /\____/
* \_/__/
*
* Main header file for the MacOS X Allegro library port.
* Any OS X Allegro specific function is declared here.
*
* By Angelo Mottola.
*
* See readme.txt for copyright information.
*/
#ifndef OSX_ALLEGRO_H
#define OSX_ALLEGRO_H
#ifndef ALLEGRO_H
#error Please include allegro.h before osxalleg.h!
#endif
#ifdef __cplusplus
extern "C" {
#endif
#ifdef __cplusplus
}
#endif
#endif
--- 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
--- NEW FILE: ft2build.h ---
/***************************************************************************/
/* */
/* ft2build.h */
/* */
/* FreeType 2 build and setup macros. */
/* (Generic version) */
/* */
/* Copyright 1996-2001 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used, */
/* modified, and distributed under the terms of the FreeType project */
/* license, LICENSE.TXT. By continuing to use, modify, or distribute */
/* this file you indicate that you have read the license and */
/* understand and accept it fully. */
/* */
/***************************************************************************/
/*************************************************************************/
/* */
/* This file corresponds to the default "ft2build.h" file for */
/* FreeType 2. It uses the "freetype" include root. */
/* */
/* Note that specific platforms might use a different configuration. */
/* See builds/unix/ft2unix.h for an example. */
/* */
/*************************************************************************/
#ifndef __FT2_BUILD_GENERIC_H__
#define __FT2_BUILD_GENERIC_H__
#include <freetype/config/ftheader.h>
#endif /* __FT2_BUILD_GENERIC_H__ */
/* END */
--- NEW FILE: allegro.h ---
/* ______ ___ ___
* /\ _ \ /\_ \ /\_ \
* \ \ \L\ \\//\ \ \//\ \ __ __ _ __ ___
* \ \ __ \ \ \ \ \ \ \ /'__`\ /'_ `\/\`'__\/ __`\
* \ \ \/\ \ \_\ \_ \_\ \_/\ __//\ \L\ \ \ \//\ \L\ \
* \ \_\ \_\/\____\/\____\ \____\ \____ \ \_\\ \____/
* \/_/\/_/\/____/\/____/\/____/\/___L\ \/_/ \/___/
* /\____/
* \_/__/
*
* Main header file for the entire Allegro library.
* (separate modules can be included from the allegro/ directory)
*
* By Shawn Hargreaves.
*
* Vincent Penquerc'h split the original allegro.h into separate headers.
*
* See readme.txt for copyright information.
*/
#ifndef ALLEGRO_H
#define ALLEGRO_H
#include "allegro/base.h"
#include "allegro/system.h"
#include "allegro/debug.h"
#include "allegro/unicode.h"
#include "allegro/mouse.h"
#include "allegro/timer.h"
#include "allegro/keyboard.h"
#include "allegro/joystick.h"
#include "allegro/palette.h"
#include "allegro/gfx.h"
#include "allegro/color.h"
#include "allegro/draw.h"
#include "allegro/rle.h"
#include "allegro/compiled.h"
#include "allegro/text.h"
#include "allegro/font.h"
#include "allegro/fli.h"
#include "allegro/config.h"
#include "allegro/gui.h"
#include "allegro/sound.h"
#include "allegro/file.h"
#include "allegro/lzss.h"
#include "allegro/datafile.h"
#include "allegro/fixed.h"
#include "allegro/fmaths.h"
#include "allegro/matrix.h"
#include "allegro/quat.h"
#include "allegro/3d.h"
#include "allegro/3dmaths.h"
#ifndef ALLEGRO_NO_COMPATIBILITY
#include "allegro/alcompat.h"
#endif
#ifndef ALLEGRO_NO_FIX_CLASS
#ifdef __cplusplus
#include "allegro/fix.h"
#endif
#endif
#ifdef ALLEGRO_EXTRA_HEADER
#include ALLEGRO_EXTRA_HEADER
#endif
#endif /* ifndef ALLEGRO_H */
--- NEW FILE: qnxalleg.h ---
/* ______ ___ ___
* /\ _ \ /\_ \ /\_ \
* \ \ \L\ \\//\ \ \//\ \ __ __ _ __ ___
* \ \ __ \ \ \ \ \ \ \ /'__`\ /'_ `\/\`'__\/ __`\
* \ \ \/\ \ \_\ \_ \_\ \_/\ __//\ \L\ \ \ \//\ \L\ \
* \ \_\ \_\/\____\/\____\ \____\ \____ \ \_\\ \____/
* \/_/\/_/\/____/\/____/\/____/\/___L\ \/_/ \/___/
* /\____/
* \_/__/
*
* Header file for the QNX Allegro library port.
*
* This doesn't need to be included; it prototypes functions you
* can use to control the library more closely.
*/
#ifndef QNX_ALLEGRO_H
#define QNX_ALLEGRO_H
#ifndef ALLEGRO_H
#error Please include allegro.h before qnxalleg.h!
#endif
#ifndef SCAN_DEPEND
#include <Pt.h>
#endif
#ifdef __cplusplus
extern "C" {
#endif
AL_FUNC(PtWidget_t *, qnx_get_window, (void));
#ifdef __cplusplus
}
#endif
#endif
|
|
From: Rob <geo...@us...> - 2011-07-03 13:11:36
|
Update of /cvsroot/timewarp/source/Timewarp In directory vz-cvs-2.sog:/tmp/cvs-serv5822/Timewarp Log Message: Directory /cvsroot/timewarp/source/Timewarp added to the repository |
|
From: Rob <geo...@us...> - 2011-07-03 13:10:41
|
Update of /cvsroot/timewarp/source/include In directory vz-cvs-2.sog:/tmp/cvs-serv5706/include Log Message: Directory /cvsroot/timewarp/source/include added to the repository |
Update of /cvsroot/timewarp/lib In directory vz-cvs-2.sog:/tmp/cvs-serv5353 Removed Files: alld.lib alleg.lib freetype6.def libfreetype.a libfreetype.dll.a libfreetype.la libfreetype.lib libjgmod.a libjgmod.lib Log Message: no message --- libfreetype.dll.a DELETED --- --- alleg.lib DELETED --- --- freetype6.def DELETED --- --- libjgmod.a DELETED --- --- alld.lib DELETED --- --- libfreetype.lib DELETED --- --- libfreetype.la DELETED --- --- libjgmod.lib DELETED --- --- libfreetype.a DELETED --- |
|
From: Rob <geo...@us...> - 2011-07-03 13:08:32
|
Update of /cvsroot/timewarp/include/allegro/inline In directory vz-cvs-2.sog:/tmp/cvs-serv5262/inline Removed Files: 3dmaths.inl asm.inl color.inl draw.inl file.inl fix.inl fmaths.inl gfx.inl gui.inl matrix.inl rle.inl system.inl Log Message: no message --- system.inl DELETED --- --- fmaths.inl DELETED --- --- file.inl DELETED --- --- draw.inl DELETED --- --- gfx.inl DELETED --- --- matrix.inl DELETED --- --- rle.inl DELETED --- --- color.inl DELETED --- --- gui.inl DELETED --- --- asm.inl DELETED --- --- 3dmaths.inl DELETED --- --- fix.inl DELETED --- |
|
From: Rob <geo...@us...> - 2011-07-02 23:48:42
|
Update of /cvsroot/timewarp In directory vz-cvs-2.sog:/tmp/cvs-serv17894 Modified Files: fleets.ini Log Message: cleaning up errors Index: fleets.ini =================================================================== RCS file: /cvsroot/timewarp/fleets.ini,v retrieving revision 1.86 retrieving revision 1.87 diff -C2 -d -r1.86 -r1.87 *** fleets.ini 2 Jun 2006 13:38:21 -0000 1.86 --- fleets.ini 2 Jul 2011 23:48:40 -0000 1.87 *************** *** 1,1362 **** [Player1] - Slot0 = tauhu - Slot1 = andgu - Slot2 = arisk - Slot3 = chebr - Size = 79 - MaxFleetCost = 10000 - Slot4 = earcr - Slot5 = ilwav - Slot6 = kzedr [...1352 lines suppressed...] --- 1,19 ---- [Player1] Slot0 = andgu ! Slot1 = aktgu ! Slot2 = artem ! Size = 5 MaxFleetCost = 500 + Slot3 = bipka + Slot4 = crore ! [Player2] ! Size = 3 MaxFleetCost = 500 + Slot0 = alckr + Slot1 = arkpi + Slot2 = artem ! [Player3] ! Size = 0 MaxFleetCost = 500 |
|
From: Rob <geo...@us...> - 2011-07-02 23:47:26
|
Update of /cvsroot/timewarp/source/other
In directory vz-cvs-2.sog:/tmp/cvs-serv17482/other
Modified Files:
gup.cpp lightning.cpp nullphas.cpp objanim.cpp orbit.cpp
planet3d.cpp radar.cpp shippart.cpp ttf.cpp vbodies.cpp
Log Message:
cleaning up errors
Index: vbodies.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/other/vbodies.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** vbodies.cpp 28 Aug 2005 20:32:16 -0000 1.15
--- vbodies.cpp 2 Jul 2011 23:46:53 -0000 1.16
***************
*** 924,928 ****
}
//twenty tries, can't find a valid damage recipient, give up now.
! tw_error("about to try to VPlanet::handle damage #3 -- this should never ever happen!");
return(0);
}
--- 924,928 ----
}
//twenty tries, can't find a valid damage recipient, give up now.
! throw("about to try to VPlanet::handle damage #3 -- this should never ever happen!");
return(0);
}
***************
*** 1235,1242 ****
void VMetalShard::compareSprites(void) {
if(this->sprite==this->mySprite) {
! tw_error("Identical sprites");
}
else {
! tw_error("non-identical sprites!");
}
}
--- 1235,1242 ----
void VMetalShard::compareSprites(void) {
if(this->sprite==this->mySprite) {
! throw("Identical sprites");
}
else {
! throw("non-identical sprites!");
}
}
***************
*** 1254,1260 ****
}
! int VMetalAsteroid::handle_damage(SpaceLocation *source, double normal, double direct) {STACKTRACE
Vector2 V;
! //tw_error("about to handle damage");
if (!exists()) return 0;
if ((normal > 0) || (direct > 0)) {
--- 1254,1260 ----
}
! int VMetalAsteroid::handle_damage(SpaceLocation *source, double normal, double direct) {
Vector2 V;
! //throw("about to handle damage");
if (!exists()) return 0;
if ((normal > 0) || (direct > 0)) {
***************
*** 1279,1284 ****
}
! void VMetalAsteroid::inflict_damage(SpaceObject *other) {STACKTRACE
! //tw_error("about to inflict damage");
if (!other->exists()) return;
damage(other, 0, damage_factor);
--- 1279,1284 ----
}
! void VMetalAsteroid::inflict_damage(SpaceObject *other) {
! //throw("about to inflict damage");
if (!other->exists()) return;
damage(other, 0, damage_factor);
***************
*** 1800,1804 ****
if(finalVelocity<0.0) {
finalVelocity = originalVelocity;
! tw_error("encountered a default final velocity!");
}
}
--- 1800,1804 ----
if(finalVelocity<0.0) {
finalVelocity = originalVelocity;
! throw("encountered a default final velocity!");
}
}
Index: shippart.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/other/shippart.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** shippart.cpp 5 Oct 2005 20:20:04 -0000 1.16
--- shippart.cpp 2 Jul 2011 23:46:53 -0000 1.17
***************
*** 32,36 ****
void BigShip::calculate()
{
! STACKTRACE;
Ship::calculate();
--- 32,36 ----
void BigShip::calculate()
{
!
Ship::calculate();
***************
*** 59,63 ****
if (fabs(v.x) > 1E6 || fabs(v.y) > 1E6 )
{
! tw_error("invalid velocity change");
}
#endif
--- 59,63 ----
if (fabs(v.x) > 1E6 || fabs(v.y) > 1E6 )
{
! throw("invalid velocity change");
}
#endif
***************
*** 67,71 ****
void BigShip::change_vel(Vector2 dvel)
{
! STACKTRACE;
int i;
--- 67,71 ----
void BigShip::change_vel(Vector2 dvel)
{
!
int i;
***************
*** 88,92 ****
void BigShip::change_pos(Vector2 dpos)
{
! STACKTRACE
int i;
--- 88,92 ----
void BigShip::change_pos(Vector2 dpos)
{
!
int i;
***************
*** 155,159 ****
void BigShipPart::syncpos()
{
! STACKTRACE
// maintain (relative) position wrt the ship
--- 155,159 ----
void BigShipPart::syncpos()
{
!
// maintain (relative) position wrt the ship
***************
*** 178,182 ****
void BigShipPart::calculate()
{
! STACKTRACE
Ship::calculate();
--- 178,182 ----
void BigShipPart::calculate()
{
!
Ship::calculate();
***************
*** 230,234 ****
int BigShipPart::handle_damage(SpaceLocation *source, double normal, double direct)
{
! STACKTRACE
// by default, transmit damage to the ship owner ...
--- 230,234 ----
int BigShipPart::handle_damage(SpaceLocation *source, double normal, double direct)
{
!
// by default, transmit damage to the ship owner ...
***************
*** 240,244 ****
void BigShipPart::inflict_damage(SpaceObject *other)
{
! STACKTRACE
Ship::inflict_damage(other);
--- 240,244 ----
void BigShipPart::inflict_damage(SpaceObject *other)
{
!
Ship::inflict_damage(other);
***************
*** 266,270 ****
void BigShipPart::change_vel(Vector2 dvel)
{
! STACKTRACE
owner->change_vel(dvel);
--- 266,270 ----
void BigShipPart::change_vel(Vector2 dvel)
{
!
owner->change_vel(dvel);
***************
*** 276,280 ****
void BigShipPart::change_pos(Vector2 dpos)
{
! STACKTRACE
owner->change_pos(dpos);
--- 276,280 ----
void BigShipPart::change_pos(Vector2 dpos)
{
!
owner->change_pos(dpos);
***************
*** 309,313 ****
void BigShipPartDevice::calculate()
{
! STACKTRACE;
SpaceObject::calculate();
--- 309,313 ----
void BigShipPartDevice::calculate()
{
!
SpaceObject::calculate();
***************
*** 334,338 ****
void BigShipPartDevice::animate(Frame *space)
{
! STACKTRACE
if (ownerpart->isdisabled())
--- 334,338 ----
void BigShipPartDevice::animate(Frame *space)
{
!
if (ownerpart->isdisabled())
***************
*** 346,350 ****
int BigShipPart::handle_fuel_sap(SpaceLocation *source, double normal)
{
! STACKTRACE
return owner->handle_fuel_sap(source, normal);
--- 346,350 ----
int BigShipPart::handle_fuel_sap(SpaceLocation *source, double normal)
{
!
return owner->handle_fuel_sap(source, normal);
Index: lightning.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/other/lightning.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** lightning.cpp 29 Jan 2006 16:18:32 -0000 1.1
--- lightning.cpp 2 Jul 2011 23:46:53 -0000 1.2
***************
*** 51,55 ****
void Lightning::draw(Frame *space, Vector2 plot_pos, Vector2 plot_size)
{
! STACKTRACE;
Vector2 P, S;
--- 51,55 ----
void Lightning::draw(Frame *space, Vector2 plot_pos, Vector2 plot_size)
{
!
Vector2 P, S;
Index: orbit.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/other/orbit.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** orbit.cpp 28 Aug 2005 20:32:16 -0000 1.10
--- orbit.cpp 2 Jul 2011 23:46:53 -0000 1.11
***************
*** 31,35 ****
int SpaceStation::handle_damage(SpaceLocation *source, double normal, double direct)
{
! STACKTRACE
Crew-=(int)(normal+direct);
--- 31,35 ----
int SpaceStation::handle_damage(SpaceLocation *source, double normal, double direct)
{
!
Crew-=(int)(normal+direct);
***************
*** 40,44 ****
void SpaceStation::calculate()
{
! STACKTRACE
//Healing beam code
--- 40,44 ----
void SpaceStation::calculate()
{
!
//Healing beam code
***************
*** 89,93 ****
void OrbitHandler::calculate()
{
! STACKTRACE;
SpaceLocation::calculate();
--- 89,93 ----
void OrbitHandler::calculate()
{
!
SpaceLocation::calculate();
***************
*** 162,166 ****
int Sun::canCollide(SpaceLocation *other)
{
! STACKTRACE
if(other->id==COMET_ID) return FALSE;
--- 162,166 ----
int Sun::canCollide(SpaceLocation *other)
{
!
if(other->id==COMET_ID) return FALSE;
***************
*** 170,174 ****
void Sun::inflict_damage(SpaceObject *other)
{
! STACKTRACE
double d = distance(other);
--- 170,174 ----
void Sun::inflict_damage(SpaceObject *other)
{
!
double d = distance(other);
***************
*** 182,186 ****
void Sun::calculate() {
! STACKTRACE
SpaceObject::calculate();
--- 182,186 ----
void Sun::calculate() {
!
SpaceObject::calculate();
Index: gup.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/other/gup.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** gup.cpp 2 Jun 2006 09:10:42 -0000 1.14
--- gup.cpp 2 Jul 2011 23:46:53 -0000 1.15
***************
*** 30,34 ****
*/
void Upgrade::clear(Ship *oship, Ship *nship, GobPlayer *gs) {
! STACKTRACE
if (oship) gs->total -= num;
--- 30,34 ----
*/
void Upgrade::clear(Ship *oship, Ship *nship, GobPlayer *gs) {
!
if (oship) gs->total -= num;
***************
*** 37,41 ****
}
void Upgrade::charge(GobPlayer *gs) { //called AFTER execute
! STACKTRACE
gs->total += 1;
--- 37,41 ----
}
void Upgrade::charge(GobPlayer *gs) { //called AFTER execute
!
gs->total += 1;
***************
*** 50,54 ****
UPGRADE(UpCrewpod)
bool update(Ship *ship, GobStation *station, GobPlayer *gs) {
! STACKTRACE
name = "Add Crewpod";
--- 50,54 ----
UPGRADE(UpCrewpod)
bool update(Ship *ship, GobStation *station, GobPlayer *gs) {
!
name = "Add Crewpod";
***************
*** 59,63 ****
}
void execute(Ship *ship, GobStation *station, GobPlayer *gs) {
! STACKTRACE
ship->crew_max += 4;
--- 59,63 ----
}
void execute(Ship *ship, GobStation *station, GobPlayer *gs) {
!
ship->crew_max += 4;
***************
*** 71,75 ****
UPGRADE(UpBattery)
bool update(Ship *ship, GobStation *station, GobPlayer *gs) {
! STACKTRACE
name = "Add Battery";
--- 71,75 ----
UPGRADE(UpBattery)
bool update(Ship *ship, GobStation *station, GobPlayer *gs) {
!
name = "Add Battery";
***************
*** 80,84 ****
}
void execute(Ship *ship, GobStation *station, GobPlayer *gs) {
! STACKTRACE
ship->batt_max += 8;
--- 80,84 ----
}
void execute(Ship *ship, GobStation *station, GobPlayer *gs) {
!
ship->batt_max += 8;
***************
*** 92,96 ****
UPGRADE(UpThrusters)
bool update(Ship *ship, GobStation *station, GobPlayer *gs) {
! STACKTRACE
name = "Upgrade Thrusters";
--- 92,96 ----
UPGRADE(UpThrusters)
bool update(Ship *ship, GobStation *station, GobPlayer *gs) {
!
name = "Upgrade Thrusters";
***************
*** 100,104 ****
}
void execute(Ship *ship, GobStation *station, GobPlayer *gs) {
! STACKTRACE
ship->speed_max *= 1 + .3 / (.25*num + 1);
--- 100,104 ----
}
void execute(Ship *ship, GobStation *station, GobPlayer *gs) {
!
ship->speed_max *= 1 + .3 / (.25*num + 1);
***************
*** 110,114 ****
UPGRADE(UpControlJets)
bool update(Ship *ship, GobStation *station, GobPlayer *gs) {
! STACKTRACE
name = "Upgrade Control Jets";
--- 110,114 ----
UPGRADE(UpControlJets)
bool update(Ship *ship, GobStation *station, GobPlayer *gs) {
!
name = "Upgrade Control Jets";
***************
*** 118,122 ****
}
void execute(Ship *ship, GobStation *station, GobPlayer *gs) {
! STACKTRACE
ship->turn_rate *= 1 + .3 / (num + 1);
--- 118,122 ----
}
void execute(Ship *ship, GobStation *station, GobPlayer *gs) {
!
ship->turn_rate *= 1 + .3 / (num + 1);
***************
*** 128,132 ****
UPGRADE(UpDynamo)
bool update(Ship *ship, GobStation *station, GobPlayer *gs) {
! STACKTRACE
name = "Upgrade Dynamo";
--- 128,132 ----
UPGRADE(UpDynamo)
bool update(Ship *ship, GobStation *station, GobPlayer *gs) {
!
name = "Upgrade Dynamo";
***************
*** 140,144 ****
}
void execute(Ship *ship, GobStation *station, GobPlayer *gs) {
! STACKTRACE
ship->recharge_amount += 1;
--- 140,144 ----
}
void execute(Ship *ship, GobStation *station, GobPlayer *gs) {
!
ship->recharge_amount += 1;
***************
*** 153,157 ****
UPGRADE(UpSupoxRange)
bool update(Ship *ship, GobStation *station, GobPlayer *gs) {
! STACKTRACE
name = "Upgrade Glob Hurler (Supox)";
--- 153,157 ----
UPGRADE(UpSupoxRange)
bool update(Ship *ship, GobStation *station, GobPlayer *gs) {
!
name = "Upgrade Glob Hurler (Supox)";
***************
*** 162,166 ****
}
void execute(Ship *ship, GobStation *station, GobPlayer *gs) {
! STACKTRACE
((SupoxBlade*)ship)->weaponRange *= 1 + .25 / (1 + num*.1);
--- 162,166 ----
}
void execute(Ship *ship, GobStation *station, GobPlayer *gs) {
!
((SupoxBlade*)ship)->weaponRange *= 1 + .25 / (1 + num*.1);
***************
*** 172,176 ****
UPGRADE(UpSupoxDamage)
bool update(Ship *ship, GobStation *station, GobPlayer *gs) {
! STACKTRACE
name = "Upgrade Glob Former (Supox)";
--- 172,176 ----
UPGRADE(UpSupoxDamage)
bool update(Ship *ship, GobStation *station, GobPlayer *gs) {
!
name = "Upgrade Glob Former (Supox)";
***************
*** 183,187 ****
}
void execute(Ship *ship, GobStation *station, GobPlayer *gs) {
! STACKTRACE
((SupoxBlade*)ship)->weaponDamage += 1;
--- 183,187 ----
}
void execute(Ship *ship, GobStation *station, GobPlayer *gs) {
!
((SupoxBlade*)ship)->weaponDamage += 1;
***************
*** 195,199 ****
UPGRADE(UpSupoxBLADE)
bool update(Ship *ship, GobStation *station, GobPlayer *gs) {
! STACKTRACE
name = "Add B.L.A.D.E. (Supox)";
--- 195,199 ----
UPGRADE(UpSupoxBLADE)
bool update(Ship *ship, GobStation *station, GobPlayer *gs) {
!
name = "Add B.L.A.D.E. (Supox)";
***************
*** 204,208 ****
}
void execute(Ship *ship, GobStation *station, GobPlayer *gs) {
! STACKTRACE
((SupoxBlade*)ship)->damage_factor += 3;
--- 204,208 ----
}
void execute(Ship *ship, GobStation *station, GobPlayer *gs) {
!
((SupoxBlade*)ship)->damage_factor += 3;
***************
*** 217,221 ****
UPGRADE(UpOrzMissile)
bool update(Ship *ship, GobStation *station, GobPlayer *gs) {
! STACKTRACE
name = "Upgrade Missiles (ORZ)";
--- 217,221 ----
UPGRADE(UpOrzMissile)
bool update(Ship *ship, GobStation *station, GobPlayer *gs) {
!
name = "Upgrade Missiles (ORZ)";
***************
*** 226,230 ****
}
void execute(Ship *ship, GobStation *station, GobPlayer *gs) {
! STACKTRACE
((OrzNemesis*)ship)->weaponDamage += 1;
--- 226,230 ----
}
void execute(Ship *ship, GobStation *station, GobPlayer *gs) {
!
((OrzNemesis*)ship)->weaponDamage += 1;
***************
*** 238,242 ****
UPGRADE(UpOrzMarineSpeed)
bool update(Ship *ship, GobStation *station, GobPlayer *gs) {
! STACKTRACE
name = "Upgrade Marine Suits (ORZ)";
--- 238,242 ----
UPGRADE(UpOrzMarineSpeed)
bool update(Ship *ship, GobStation *station, GobPlayer *gs) {
!
name = "Upgrade Marine Suits (ORZ)";
***************
*** 247,251 ****
}
void execute(Ship *ship, GobStation *station, GobPlayer *gs) {
! STACKTRACE
((OrzNemesis*)ship)->specialArmour += 1;
--- 247,251 ----
}
void execute(Ship *ship, GobStation *station, GobPlayer *gs) {
!
((OrzNemesis*)ship)->specialArmour += 1;
***************
*** 258,262 ****
UPGRADE(UpOrzAbsorbtion)
bool update(Ship *ship, GobStation *station, GobPlayer *gs) {
! STACKTRACE
name = "Absorbtion (ORZ)";
--- 258,262 ----
UPGRADE(UpOrzAbsorbtion)
bool update(Ship *ship, GobStation *station, GobPlayer *gs) {
!
name = "Absorbtion (ORZ)";
***************
*** 268,277 ****
}
void execute(Ship *ship, GobStation *station, GobPlayer *gs) {
! STACKTRACE
((OrzNemesis*)ship)->absorption = 256 / 3;
}
void charge(GobPlayer *gs) {
! STACKTRACE
Upgrade::charge(gs);
--- 268,277 ----
}
void execute(Ship *ship, GobStation *station, GobPlayer *gs) {
!
((OrzNemesis*)ship)->absorption = 256 / 3;
}
void charge(GobPlayer *gs) {
!
Upgrade::charge(gs);
***************
*** 287,291 ****
UPGRADE(UpKohrAhBladeDamage)
bool update(Ship *ship, GobStation *station, GobPlayer *gs) {
! STACKTRACE
name = "Increase Shuriken Sharpness (Kohr-Ah)";
--- 287,291 ----
UPGRADE(UpKohrAhBladeDamage)
bool update(Ship *ship, GobStation *station, GobPlayer *gs) {
!
name = "Increase Shuriken Sharpness (Kohr-Ah)";
***************
*** 296,300 ****
}
void execute(Ship *ship, GobStation *station, GobPlayer *gs) {
! STACKTRACE
((KohrAhMarauder*)ship)->weaponDamage += 1;
--- 296,300 ----
}
void execute(Ship *ship, GobStation *station, GobPlayer *gs) {
!
((KohrAhMarauder*)ship)->weaponDamage += 1;
***************
*** 307,311 ****
UPGRADE(UpKohrAhBladeSpeed)
bool update(Ship *ship, GobStation *station, GobPlayer *gs) {
! STACKTRACE
if (strcmp("kohma", ship->type->id)) return false;
--- 307,311 ----
UPGRADE(UpKohrAhBladeSpeed)
bool update(Ship *ship, GobStation *station, GobPlayer *gs) {
!
if (strcmp("kohma", ship->type->id)) return false;
***************
*** 316,320 ****
}
void execute(Ship *ship, GobStation *station, GobPlayer *gs) {
! STACKTRACE
((KohrAhMarauder*)ship)->weaponVelocity *= 1.2;
--- 316,320 ----
}
void execute(Ship *ship, GobStation *station, GobPlayer *gs) {
!
((KohrAhMarauder*)ship)->weaponVelocity *= 1.2;
***************
*** 325,329 ****
UPGRADE(UpKohrAhFireRange)
bool update(Ship *ship, GobStation *station, GobPlayer *gs) {
! STACKTRACE
name = "double F.R.I.E.D. range (Kohr-Ah)";
--- 325,329 ----
UPGRADE(UpKohrAhFireRange)
bool update(Ship *ship, GobStation *station, GobPlayer *gs) {
!
name = "double F.R.I.E.D. range (Kohr-Ah)";
***************
*** 335,339 ****
}
void execute(Ship *ship, GobStation *station, GobPlayer *gs) {
! STACKTRACE
((KohrAhMarauder*)ship)->specialRange *= 2;
--- 335,339 ----
}
void execute(Ship *ship, GobStation *station, GobPlayer *gs) {
!
((KohrAhMarauder*)ship)->specialRange *= 2;
***************
*** 346,350 ****
UPGRADE(UpKohrAhFireDamage)
bool update(Ship *ship, GobStation *station, GobPlayer *gs) {
! STACKTRACE
name = "double F.R.I.E.D. damage (Kohr-Ah)";
--- 346,350 ----
UPGRADE(UpKohrAhFireDamage)
bool update(Ship *ship, GobStation *station, GobPlayer *gs) {
!
name = "double F.R.I.E.D. damage (Kohr-Ah)";
***************
*** 356,360 ****
}
void execute(Ship *ship, GobStation *station, GobPlayer *gs) {
! STACKTRACE
((KohrAhMarauder*)ship)->specialDamage *= 2;
--- 356,360 ----
}
void execute(Ship *ship, GobStation *station, GobPlayer *gs) {
!
((KohrAhMarauder*)ship)->specialDamage *= 2;
***************
*** 370,374 ****
UPGRADE(UpUtwigJuggerRange)
bool update(Ship *ship, GobStation *station, GobPlayer *gs) {
! STACKTRACE
name = "Upgrade Bolt Regulator (Utwig)";
--- 370,374 ----
UPGRADE(UpUtwigJuggerRange)
bool update(Ship *ship, GobStation *station, GobPlayer *gs) {
!
name = "Upgrade Bolt Regulator (Utwig)";
***************
*** 379,383 ****
}
void execute(Ship *ship, GobStation *station, GobPlayer *gs) {
! STACKTRACE
((UtwigJugger*)ship)->weaponRange += 100;
--- 379,383 ----
}
void execute(Ship *ship, GobStation *station, GobPlayer *gs) {
!
((UtwigJugger*)ship)->weaponRange += 100;
***************
*** 387,391 ****
UPGRADE(UpUtwigJuggerDamage)
bool update(Ship *ship, GobStation *station, GobPlayer *gs) {
! STACKTRACE
name = "Upgrade Bolt Charger (Utwig)";
--- 387,391 ----
UPGRADE(UpUtwigJuggerDamage)
bool update(Ship *ship, GobStation *station, GobPlayer *gs) {
!
name = "Upgrade Bolt Charger (Utwig)";
***************
*** 396,400 ****
}
void execute(Ship *ship, GobStation *station, GobPlayer *gs) {
! STACKTRACE
((UtwigJugger*)ship)->weaponDamage += 1;
--- 396,400 ----
}
void execute(Ship *ship, GobStation *station, GobPlayer *gs) {
!
((UtwigJugger*)ship)->weaponDamage += 1;
***************
*** 405,409 ****
UPGRADE(UpUtwigJuggerROF)
bool update(Ship *ship, GobStation *station, GobPlayer *gs) {
! STACKTRACE
name = "Upgrade Bolt Generator (Utwig)";
--- 405,409 ----
UPGRADE(UpUtwigJuggerROF)
bool update(Ship *ship, GobStation *station, GobPlayer *gs) {
!
name = "Upgrade Bolt Generator (Utwig)";
***************
*** 415,419 ****
}
void execute(Ship *ship, GobStation *station, GobPlayer *gs) {
! STACKTRACE
ship->weapon_rate -= 50;
--- 415,419 ----
}
void execute(Ship *ship, GobStation *station, GobPlayer *gs) {
!
ship->weapon_rate -= 50;
***************
*** 423,427 ****
UPGRADE(UpUtwigJuggerMaskOfHonestDemeanor)
bool update(Ship *ship, GobStation *station, GobPlayer *gs) {
! STACKTRACE
name = "Mask of Honest Demeanor (max 1 mask)";
--- 423,427 ----
UPGRADE(UpUtwigJuggerMaskOfHonestDemeanor)
bool update(Ship *ship, GobStation *station, GobPlayer *gs) {
!
name = "Mask of Honest Demeanor (max 1 mask)";
***************
*** 433,437 ****
}
void execute(Ship *ship, GobStation *station, GobPlayer *gs) {
! STACKTRACE
gs->value_starbucks += 251;
--- 433,437 ----
}
void execute(Ship *ship, GobStation *station, GobPlayer *gs) {
!
gs->value_starbucks += 251;
***************
*** 442,446 ****
UPGRADE(UpUtwigJuggerMaskOfElephantineFortitude)
bool update(Ship *ship, GobStation *station, GobPlayer *gs) {
! STACKTRACE
name = "Mask of Elephantine Fortitude (max 1 mask)";
--- 442,446 ----
UPGRADE(UpUtwigJuggerMaskOfElephantineFortitude)
bool update(Ship *ship, GobStation *station, GobPlayer *gs) {
!
name = "Mask of Elephantine Fortitude (max 1 mask)";
***************
*** 452,456 ****
}
void execute(Ship *ship, GobStation *station, GobPlayer *gs) {
! STACKTRACE
((UtwigJugger*)ship)->fortitude = 1;
--- 452,456 ----
}
void execute(Ship *ship, GobStation *station, GobPlayer *gs) {
!
((UtwigJugger*)ship)->fortitude = 1;
***************
*** 465,469 ****
UPGRADE(UpDivineFavor)
bool update(Ship *ship, GobStation *station, GobPlayer *gs) {
! STACKTRACE
name = "Divine Favor (unique)";
--- 465,469 ----
UPGRADE(UpDivineFavor)
bool update(Ship *ship, GobStation *station, GobPlayer *gs) {
!
name = "Divine Favor (unique)";
***************
*** 477,481 ****
}
void clear(Ship *oship, Ship *nship, GobPlayer *gs) {
! STACKTRACE
if (!oship) num = 0;
--- 477,481 ----
}
void clear(Ship *oship, Ship *nship, GobPlayer *gs) {
!
if (!oship) num = 0;
***************
*** 490,494 ****
UPGRADE(UpUnholyAura)
bool update(Ship *ship, GobStation *station, GobPlayer *gs) {
! STACKTRACE
name = "the Devil protects his own...";
--- 490,494 ----
UPGRADE(UpUnholyAura)
bool update(Ship *ship, GobStation *station, GobPlayer *gs) {
!
name = "the Devil protects his own...";
***************
*** 503,512 ****
}
void execute(Ship *ship, GobStation *station, GobPlayer *gs) {
! STACKTRACE
game->add ( new UnholyAura ( ship ) );
}
void clear(Ship *oship, Ship *nship, GobPlayer *gs) {
! STACKTRACE
if (!oship) num = 0;
--- 503,512 ----
}
void execute(Ship *ship, GobStation *station, GobPlayer *gs) {
!
game->add ( new UnholyAura ( ship ) );
}
void clear(Ship *oship, Ship *nship, GobPlayer *gs) {
!
if (!oship) num = 0;
***************
*** 526,530 ****
GobDefender *def[6];
bool update(Ship *ship, GobStation *station, GobPlayer *gs) {
! STACKTRACE
name = "External Defense System";
--- 526,530 ----
GobDefender *def[6];
bool update(Ship *ship, GobStation *station, GobPlayer *gs) {
!
name = "External Defense System";
***************
*** 536,540 ****
}
void execute(Ship *ship, GobStation *station, GobPlayer *gs) {
! STACKTRACE
def[num] = new GobDefender(ship);
--- 536,540 ----
}
void execute(Ship *ship, GobStation *station, GobPlayer *gs) {
!
def[num] = new GobDefender(ship);
***************
*** 544,548 ****
}
void clear(Ship *oship, Ship *nship, GobPlayer *gs) {
! STACKTRACE
if (!oship) num = 0;
--- 544,548 ----
}
void clear(Ship *oship, Ship *nship, GobPlayer *gs) {
!
if (!oship) num = 0;
***************
*** 568,572 ****
Presence **locater;
bool update(Ship *ship, GobStation *station, GobPlayer *gs) {
! STACKTRACE
name = "Planet Locater";
--- 568,572 ----
Presence **locater;
bool update(Ship *ship, GobStation *station, GobPlayer *gs) {
!
name = "Planet Locater";
***************
*** 578,582 ****
}
void execute(Ship *ship, GobStation *station, GobPlayer *gs) {
! STACKTRACE
/*
locater = new Presence *[gobgame->num_planets];
--- 578,582 ----
}
void execute(Ship *ship, GobStation *station, GobPlayer *gs) {
!
/*
locater = new Presence *[gobgame->num_planets];
***************
*** 588,592 ****
}
void clear(Ship *oship, Ship *nship, GobPlayer *gs) {
! STACKTRACE
Upgrade::clear(oship, nship, gs);
--- 588,592 ----
}
void clear(Ship *oship, Ship *nship, GobPlayer *gs) {
!
Upgrade::clear(oship, nship, gs);
***************
*** 602,606 ****
UPGRADE(UpHyperDynamo)
bool update(Ship *ship, GobStation *station, GobPlayer *gs) {
! STACKTRACE
name = "Hyper Dynamo (ancient artifact)";
--- 602,606 ----
UPGRADE(UpHyperDynamo)
bool update(Ship *ship, GobStation *station, GobPlayer *gs) {
!
name = "Hyper Dynamo (ancient artifact)";
***************
*** 696,700 ****
}
void UnholyAura::animate (Frame *frame) {
! STACKTRACE
Vector2 p = corner(focus->normal_pos());
--- 696,700 ----
}
void UnholyAura::animate (Frame *frame) {
!
Vector2 p = corner(focus->normal_pos());
***************
*** 734,738 ****
}
void UnholyAura::calculate () {
! STACKTRACE
if (!focus->exists()) die();
--- 734,738 ----
}
void UnholyAura::calculate () {
!
if (!focus->exists()) die();
Index: objanim.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/other/objanim.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** objanim.cpp 2 Aug 2005 00:23:48 -0000 1.10
--- objanim.cpp 2 Jul 2011 23:46:53 -0000 1.11
***************
*** 23,27 ****
if (k >= remember_num_frames || k < 0)
{
! tw_error("Object Animation error in animation frame !! Should have died.");
}
}
--- 23,27 ----
if (k >= remember_num_frames || k < 0)
{
! throw("Object Animation error in animation frame !! Should have died.");
}
}
***************
*** 29,33 ****
void ObjectAnimation::calculate()
{
! STACKTRACE;
// divide by 64 (yields the animation frame)
--- 29,33 ----
void ObjectAnimation::calculate()
{
!
// divide by 64 (yields the animation frame)
***************
*** 46,50 ****
if (k >= remember_num_frames || k < 0)
{
! tw_error("Object Animation error in animation frame !! Should have died.");
}
--- 46,50 ----
if (k >= remember_num_frames || k < 0)
{
! throw("Object Animation error in animation frame !! Should have died.");
}
***************
*** 60,64 ****
if (sprite_index >= sprite->frames())
{
! tw_error("SpaceSprite::animate - index %d in %s >= count %d", sprite_index, get_identity(), sprite->frames());
return;
}
--- 60,64 ----
if (sprite_index >= sprite->frames())
{
! throw("SpaceSprite::animate - index %d in %s >= count %d", sprite_index, get_identity(), sprite->frames());
return;
}
Index: ttf.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/other/ttf.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** ttf.cpp 18 Jun 2006 13:10:02 -0000 1.9
--- ttf.cpp 2 Jul 2011 23:46:53 -0000 1.10
***************
*** 69,73 ****
} else {
! return;//tw_error("unsupported bitmap format");
}
--- 69,73 ----
} else {
! return;//throw("unsupported bitmap format");
}
Index: radar.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/other/radar.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** radar.cpp 24 Mar 2004 23:51:43 -0000 1.8
--- radar.cpp 2 Jul 2011 23:46:53 -0000 1.9
***************
*** 54,58 ****
void ZRadar::animate(Frame *space)
{
! STACKTRACE
//If the radar is disabled, don't do anything.
--- 54,58 ----
void ZRadar::animate(Frame *space)
{
!
//If the radar is disabled, don't do anything.
***************
*** 81,85 ****
void ZRadar::Paint(BITMAP *Slate, Vector2 T)
{
! STACKTRACE
for(int num=0; num<physics->num_items; num++)
--- 81,85 ----
void ZRadar::Paint(BITMAP *Slate, Vector2 T)
{
!
for(int num=0; num<physics->num_items; num++)
Index: nullphas.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/other/nullphas.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** nullphas.cpp 23 Aug 2005 22:21:16 -0000 1.9
--- nullphas.cpp 2 Jul 2011 23:46:53 -0000 1.10
***************
*** 14,18 ****
void NullPhaser::animate( Frame* space ){}
void NullPhaser::calculate(){
! STACKTRACE
if( state > 0 ){
--- 14,18 ----
void NullPhaser::animate( Frame* space ){}
void NullPhaser::calculate(){
!
if( state > 0 ){
Index: planet3d.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/other/planet3d.cpp,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** planet3d.cpp 16 Mar 2006 22:30:33 -0000 1.27
--- planet3d.cpp 2 Jul 2011 23:46:53 -0000 1.28
***************
*** 52,56 ****
if (!sbitmap[0])
{
! tw_error("Basic sprite shape expected, but doesn't exist");
}
}
--- 52,56 ----
if (!sbitmap[0])
{
! throw("Basic sprite shape expected, but doesn't exist");
}
}
***************
*** 114,122 ****
// something extra is needed ...
! // call this in void NormalGame::init_objects() {STACKTRACE
// instead of the creation of a 2D planet.
Planet *create_planet( Vector2 position )
{
! STACKTRACE;
// first, check the server.ini settings to see which type of planet you want
--- 114,122 ----
// something extra is needed ...
! // call this in void NormalGame::init_objects() {
// instead of the creation of a 2D planet.
Planet *create_planet( Vector2 position )
{
!
// first, check the server.ini settings to see which type of planet you want
***************
*** 155,159 ****
DATAFILE *rawdata = load_datafile("planet3d.dat");
! if(!rawdata) error("Error loading planet3D data");
--- 155,159 ----
DATAFILE *rawdata = load_datafile("planet3d.dat");
! if(!rawdata) throw("Error loading planet3D data");
***************
*** 186,190 ****
if (Nplanets == 0)
! tw_error("No planet data !!");
k = planetlist[tw_random(Nplanets)];
--- 186,190 ----
if (Nplanets == 0)
! throw("No planet data !!");
k = planetlist[tw_random(Nplanets)];
***************
*** 203,207 ****
if (!(datapart && datapart->type == DAT_BITMAP))
{
! tw_error("Cannot find the specular map of the planet, or not a bmp");
}
// create a sprite
--- 203,207 ----
if (!(datapart && datapart->type == DAT_BITMAP))
{
! throw("Cannot find the specular map of the planet, or not a bmp");
}
// create a sprite
***************
*** 215,219 ****
if (spec_map->size().x != mapW || spec_map->size().y != mapH )
{
! tw_error("color map and spec map have different sizes !!");
}
--- 215,219 ----
if (spec_map->size().x != mapW || spec_map->size().y != mapH )
{
! throw("color map and spec map have different sizes !!");
}
***************
*** 245,249 ****
} else {
! tw_error("Unknown planet dimension in create_planet()");
}
--- 245,249 ----
} else {
! throw("Unknown planet dimension in create_planet()");
}
***************
*** 696,700 ****
void Planet3D::calculate()
{
! STACKTRACE
Planet::calculate();
--- 696,700 ----
void Planet3D::calculate()
{
!
Planet::calculate();
***************
*** 712,716 ****
void Planet3D::animate_pre()
{
! STACKTRACE;
--- 712,716 ----
void Planet3D::animate_pre()
{
!
***************
*** 1135,1139 ****
void Planet3D::animate( Frame* space )
{
! STACKTRACE;
animate_pre();
--- 1135,1139 ----
void Planet3D::animate( Frame* space )
{
!
animate_pre();
|
|
From: Rob <geo...@us...> - 2011-07-02 23:47:25
|
Update of /cvsroot/timewarp/source/util
In directory vz-cvs-2.sog:/tmp/cvs-serv17482/util
Modified Files:
aastr.h base.cpp get_time.c random.cpp sounds.cpp types.cpp
Log Message:
cleaning up errors
Index: types.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/util/types.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** types.cpp 24 Mar 2004 23:51:45 -0000 1.5
--- types.cpp 2 Jul 2011 23:46:53 -0000 1.6
***************
*** 2,15 ****
#include "base.h"
//#include "types.h"
- #include "errors.h"
-
- COMPILE_TIME_ASSERT(sizeof(Uint8 ) == 1);
- COMPILE_TIME_ASSERT(sizeof(Uint16) == 2);
- COMPILE_TIME_ASSERT(sizeof(Uint32) == 4);
- COMPILE_TIME_ASSERT(sizeof(Uint64) == 8);
-
- COMPILE_TIME_ASSERT(sizeof(Sint8 ) == 1);
- COMPILE_TIME_ASSERT(sizeof(Sint16) == 2);
- COMPILE_TIME_ASSERT(sizeof(Sint32) == 4);
- COMPILE_TIME_ASSERT(sizeof(Sint64) == 8);
--- 2,4 ----
Index: aastr.h
===================================================================
RCS file: /cvsroot/timewarp/source/util/aastr.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** aastr.h 18 Jun 2006 13:10:01 -0000 1.8
--- aastr.h 2 Jul 2011 23:46:53 -0000 1.9
***************
*** 202,214 ****
// Rotation.
void aa_rotate_scaled_bitmap (BITMAP* src, BITMAP* dst,
! int x, int y, fixed angle,
! fixed scalex, fixed scaley);
void aa_rotate_scaled_sprite (BITMAP* dst, BITMAP* src,
! int x, int y, fixed angle,
! fixed scalex, fixed scaley);
void aa_rotate_bitmap (BITMAP* src, BITMAP* dst,
! int x, int y, fixed angle);
void aa_rotate_sprite (BITMAP* dst, BITMAP* src,
! int x, int y, fixed angle);
--- 202,214 ----
// Rotation.
void aa_rotate_scaled_bitmap (BITMAP* src, BITMAP* dst,
! int x, int y, int angle,
! int scalex, int scaley);
void aa_rotate_scaled_sprite (BITMAP* dst, BITMAP* src,
! int x, int y, int angle,
! int scalex, int scaley);
void aa_rotate_bitmap (BITMAP* src, BITMAP* dst,
! int x, int y, int angle);
void aa_rotate_sprite (BITMAP* dst, BITMAP* src,
! int x, int y, int angle);
Index: random.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/util/random.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** random.cpp 18 Jun 2006 13:10:01 -0000 1.12
--- random.cpp 2 Jul 2011 23:46:53 -0000 1.13
***************
*** 6,10 ****
#include "base.h"
- #include "errors.h"
#include "types.h"
#include "random.h"
--- 6,9 ----
***************
*** 230,234 ****
w = tw_random(maxval);
if (w < 0 || w >= maxval)
! tw_error("unsigned int value out of bounds");
}
--- 229,233 ----
w = tw_random(maxval);
if (w < 0 || w >= maxval)
! throw("unsigned int value out of bounds");
}
***************
*** 278,282 ****
if ((a != 0) && (val < 0 || val >= a))
{
! tw_error("random (double), out of bounds!");
}
--- 277,281 ----
if ((a != 0) && (val < 0 || val >= a))
{
! throw("random (double), out of bounds!");
}
***************
*** 295,299 ****
if (a < 0)
{
! tw_error("random: needing to convert a negative integer to an unsigned integer: should not happen");
}
--- 294,298 ----
if (a < 0)
{
! throw("random: needing to convert a negative integer to an unsigned integer: should not happen");
}
***************
*** 303,307 ****
if (k < 0 || k >= a)
{
! tw_error("random (int), out of bounds!");
}
--- 302,306 ----
if (k < 0 || k >= a)
{
! throw("random (int), out of bounds!");
}
Index: get_time.c
===================================================================
RCS file: /cvsroot/timewarp/source/util/get_time.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** get_time.c 24 Mar 2004 23:51:45 -0000 1.10
--- get_time.c 2 Jul 2011 23:46:53 -0000 1.11
***************
*** 57,61 ****
#include "get_time.h"
#include "base.h"
- #include "errors.h"
--- 57,60 ----
***************
*** 157,161 ****
return bob.QuadPart - winmm_qpc_base;
}
! tw_error("QueryPerformanceCounter return 0");
return 0;
}
--- 156,160 ----
return bob.QuadPart - winmm_qpc_base;
}
! //throw("QueryPerformanceCounter return 0");
return 0;
}
***************
*** 187,191 ****
LOCK_FUNCTION(allegro_get_time);
LOCK_VARIABLE(allegro_time);
! if (install_timer() < 0) tw_error("Allegro timer installation failed");
install_int(&global_timer, allegro_period);
}
--- 186,190 ----
LOCK_FUNCTION(allegro_get_time);
LOCK_VARIABLE(allegro_time);
! //if (install_timer() < 0) throw("Allegro timer installation failed");
install_int(&global_timer, allegro_period);
}
Index: base.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/util/base.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** base.cpp 18 Jun 2006 13:10:01 -0000 1.9
--- base.cpp 2 Jul 2011 23:46:53 -0000 1.10
***************
*** 4,13 ****
#include <string.h>
#include "base.h"
- #include "errors.h"
-
- COMPILE_TIME_ASSERT(sizeof(char)==1);
- COMPILE_TIME_ASSERT(sizeof(short)==2);
- COMPILE_TIME_ASSERT(sizeof(int)==4);
- //COMPILE_TIME_ASSERT(sizeof(long)==4);
__call_before_main::__call_before_main ( void (*func)() ) {
--- 4,7 ----
Index: sounds.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/util/sounds.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** sounds.cpp 22 Sep 2005 07:24:31 -0000 1.9
--- sounds.cpp 2 Jul 2011 23:46:53 -0000 1.10
***************
*** 7,11 ****
#include "base.h"
#include "sounds.h"
- #include "errors.h" //only used for log_debug() function
//#include "../melee.h"
--- 7,10 ----
***************
*** 41,47 ****
int SoundSystem::is_music_supported() const {
# ifdef NO_JGMOD
! return 0;
# else
! return 1;
# endif
}
--- 40,46 ----
int SoundSystem::is_music_supported() const {
# ifdef NO_JGMOD
! return 0;
# else
! return 1;
# endif
}
***************
*** 54,61 ****
if (state & MOD_ENABLED) {
::remove_mod();
- log_debug("Music disabled\n");
}
::remove_sound();
- log_debug("Sound disabled\n");
}
state &= ~ENABLED;
--- 53,58 ----
***************
*** 85,89 ****
state |= DISABLED;
int voices = detect_digi_driver(DIGI_TW);
! log_debug("Sound driver pre-aproved %d voices\n", voices);
if (voices <= 0) return;
if (voices > MAX_SOUND_CHANNELS + MAX_MUSIC_CHANNELS) voices = MAX_SOUND_CHANNELS + MAX_MUSIC_CHANNELS;
--- 82,86 ----
state |= DISABLED;
int voices = detect_digi_driver(DIGI_TW);
!
if (voices <= 0) return;
if (voices > MAX_SOUND_CHANNELS + MAX_MUSIC_CHANNELS) voices = MAX_SOUND_CHANNELS + MAX_MUSIC_CHANNELS;
***************
*** 101,115 ****
if (sound_channels > MAX_SOUND_CHANNELS) sound_channels = MAX_SOUND_CHANNELS;
::set_volume_per_voice(2);
! log_debug("Requesting %d voices for sound and %d for music\n", sound_channels, music_channels);
::reserve_voices(sound_channels + music_channels, 0);
if (install_sound(DIGI_TW, MIDI_TW, "") < 0) {
! log_debug("Sound initialization failed\n");
! log_debug("allegro_error: %s\n", allegro_error);
sound_channels = 0;
music_channels = 0;
return;
}
! log_debug("Sound initialization succeeded\n");
! // ::set_volume(255, 255);
state &=~DISABLED;
state |= ENABLED;
--- 98,111 ----
if (sound_channels > MAX_SOUND_CHANNELS) sound_channels = MAX_SOUND_CHANNELS;
::set_volume_per_voice(2);
!
::reserve_voices(sound_channels + music_channels, 0);
if (install_sound(DIGI_TW, MIDI_TW, "") < 0) {
!
sound_channels = 0;
music_channels = 0;
return;
}
!
! // ::set_volume(255, 255);
state &=~DISABLED;
state |= ENABLED;
***************
*** 117,121 ****
::install_mod( music_channels );
::set_mod_volume(music_volume);
! log_debug("Music initialized (maybe)\n");
state |= MOD_ENABLED;
}
--- 113,117 ----
::install_mod( music_channels );
::set_mod_volume(music_volume);
!
state |= MOD_ENABLED;
}
***************
*** 130,134 ****
if (loop)
{
! tw_error("a looped option for a temporary SAMPLE is not allowed");
} else {
--- 126,130 ----
if (loop)
{
! throw("a looped option for a temporary SAMPLE is not allowed");
} else {
***************
*** 143,147 ****
if ( duration > time_available )
{
! tw_error("the sample might disappear too soon; increase DEATH_FRAMES");
}
}
--- 139,143 ----
if ( duration > time_available )
{
! throw("the sample might disappear too soon; increase DEATH_FRAMES");
}
}
***************
*** 150,179 ****
int SoundSystem::play (SAMPLE *spl, int vol, int pan, int freq, bool loop, bool noerrorcheck) {
! if ((state & (ENABLED | SOUND_ON)) == (ENABLED | SOUND_ON))
! {
! //if (freq > 4535) freq = 4535;
! //I THINK that the 4536 bug is specific to my sound hardware, so that's commented out
! if (!noerrorcheck)
! check_sample_duration(spl, freq, loop);
! return ::play_sample (spl, (vol * sound_volume) >> 8, pan, freq, loop);
! } else {
! return -1;
! }
}
void SoundSystem::stop (SAMPLE *spl) {
! if (state & ENABLED) {
! ::stop_sample (spl);
! return;
}
! else return;
}
void SoundSystem::stop (int voice_id) {
! if (voice_id < 0) {tw_error("negative voice id");}
if (state & ENABLED) {
::voice_stop (voice_id);
return;
- }
- else return;
}
--- 146,179 ----
int SoundSystem::play (SAMPLE *spl, int vol, int pan, int freq, bool loop, bool noerrorcheck) {
! if (spl) {
! if ((state & (ENABLED | SOUND_ON)) == (ENABLED | SOUND_ON))
! {
! //if (freq > 4535) freq = 4535;
! //I THINK that the 4536 bug is specific to my sound hardware, so that's commented out
! if (!noerrorcheck)
! check_sample_duration(spl, freq, loop);
! return ::play_sample (spl, (vol * sound_volume) >> 8, pan, freq, loop);
! } else {
! return -1;
! }
}
+ }
void SoundSystem::stop (SAMPLE *spl) {
! if (spl) {
! if (state & ENABLED) {
! ::stop_sample (spl);
! return;
}
! else return;
}
+ }
void SoundSystem::stop (int voice_id) {
! if (voice_id < 0) {throw("negative voice id");}
if (state & ENABLED) {
::voice_stop (voice_id);
return;
}
+ else return;
+ }
***************
*** 185,189 ****
if (loop)
{
! tw_error("a looped option for a temporary JGMOD is not allowed");
} else {
double time_available = DEATH_FRAMES * physics->frame_time * 1E-3;
--- 185,189 ----
if (loop)
{
! throw("a looped option for a temporary JGMOD is not allowed");
} else {
double time_available = DEATH_FRAMES * physics->frame_time * 1E-3;
***************
*** 193,197 ****
if (time_available < 20.0)
{
! tw_error("the mod music might disappear too soon; increase DEATH_FRAMES");
}
}
--- 193,197 ----
if (time_available < 20.0)
{
! throw("the mod music might disappear too soon; increase DEATH_FRAMES");
}
}
***************
*** 212,216 ****
looping_music = music;
return;
! }
void SoundSystem::stop_music () {
if (state & MOD_ENABLED)
--- 212,216 ----
looping_music = music;
return;
! }
void SoundSystem::stop_music () {
if (state & MOD_ENABLED)
***************
*** 218,222 ****
fake_mod_playing = false;
return;
! }
void SoundSystem::set_volumes(int sound_volume, int music_volume, int sound_on, int music_on) {
if (!(state & (ENABLED | DISABLED))) {
--- 218,222 ----
fake_mod_playing = false;
return;
! }
void SoundSystem::set_volumes(int sound_volume, int music_volume, int sound_on, int music_on) {
if (!(state & (ENABLED | DISABLED))) {
***************
*** 235,241 ****
if (!(state & MUSIC_ON)) ::stop_mod();
else if (fake_mod_playing && !is_music_playing()) play_music(looping_music, true);
- }
- return;
}
Music *SoundSystem::load_music(const char *fname)
--- 235,241 ----
if (!(state & MUSIC_ON)) ::stop_mod();
else if (fake_mod_playing && !is_music_playing()) play_music(looping_music, true);
}
+ return;
+ }
Music *SoundSystem::load_music(const char *fname)
|
|
From: Rob <geo...@us...> - 2011-07-02 23:47:23
|
Update of /cvsroot/timewarp/source/sc2ships
In directory vz-cvs-2.sog:/tmp/cvs-serv17482/sc2ships
Modified Files:
shppkufu.cpp shpslypr.cpp
Log Message:
cleaning up errors
Index: shppkufu.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/sc2ships/shppkufu.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** shppkufu.cpp 26 Aug 2005 21:55:19 -0000 1.18
--- shppkufu.cpp 2 Jul 2011 23:47:21 -0000 1.19
***************
*** 176,180 ****
if (s->ship != s || parent != 0)
{
! tw_error("Reincarnation mistake.");
}
--- 176,180 ----
if (s->ship != s || parent != 0)
{
! throw("Reincarnation mistake.");
}
Index: shpslypr.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/sc2ships/shpslypr.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** shpslypr.cpp 28 Aug 2005 20:32:55 -0000 1.20
--- shpslypr.cpp 2 Jul 2011 23:47:21 -0000 1.21
***************
*** 430,434 ****
if (!q.currento->isObject())
{
! tw_error("wrong grid search ...");
}
--- 430,434 ----
if (!q.currento->isObject())
{
! throw("wrong grid search ...");
}
|
|
From: Yura S. <yu...@us...> - 2007-04-23 22:36:33
|
Update of /cvsroot/timewarp/source/util In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv6284/source/util Modified Files: pmask.c Log Message: sizeof(long) is 8 on 64bit, it needs to be 4 for 32bit color Index: pmask.c =================================================================== RCS file: /cvsroot/timewarp/source/util/pmask.c,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** pmask.c 18 Jun 2006 13:10:01 -0000 1.11 --- pmask.c 23 Apr 2007 22:36:32 -0000 1.12 *************** *** 452,456 **** while (_y < _h) { int ty, tx; ! unsigned long addr = bmp_write_line(destination, y + _y) + x * sizeof(long); ty = _y * mask->h / h; //unsigned long *dat = mask->mask + ty; --- 452,456 ---- while (_y < _h) { int ty, tx; ! unsigned long addr = bmp_write_line(destination, y + _y) + x * 4; ty = _y * mask->h / h; //unsigned long *dat = mask->mask + ty; *************** *** 460,464 **** //if ( (dat[(tx>>21)] << ((tx>>16) & 31)) & 0x80000000UL ) if ( _get_pmask_pixel(mask,tx>>16,ty) ) ! bmp_write32(addr+_x*sizeof(long), color); tx += scale; _x += 1; --- 460,464 ---- //if ( (dat[(tx>>21)] << ((tx>>16) & 31)) & 0x80000000UL ) if ( _get_pmask_pixel(mask,tx>>16,ty) ) ! bmp_write32(addr+_x*4, color); tx += scale; _x += 1; |
|
From: Yura S. <yu...@us...> - 2007-04-23 22:36:33
|
Update of /cvsroot/timewarp In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv6284 Modified Files: client.ini Log Message: sizeof(long) is 8 on 64bit, it needs to be 4 for 32bit color Index: client.ini =================================================================== RCS file: /cvsroot/timewarp/client.ini,v retrieving revision 1.37 retrieving revision 1.38 diff -C2 -d -r1.37 -r1.38 *** client.ini 18 Jun 2006 13:10:03 -0000 1.37 --- client.ini 23 Apr 2007 22:36:32 -0000 1.38 *************** *** 77,80 **** [Menu] skin = interfaces/gametest ! SelectGame = 11 --- 77,80 ---- [Menu] skin = interfaces/gametest ! SelectGame = 0 |
|
From: Yura S. <yu...@us...> - 2007-04-16 23:55:34
|
Update of /cvsroot/timewarp/source/newships In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv27572/source/newships Modified Files: shpdajem.cpp shpducla.cpp shpglads.cpp shptaugl.cpp Log Message: TimeWarp now compile using GCC 4.* Index: shpglads.cpp =================================================================== RCS file: /cvsroot/timewarp/source/newships/shpglads.cpp,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** shpglads.cpp 28 Aug 2005 20:34:08 -0000 1.13 --- shpglads.cpp 16 Apr 2007 23:55:32 -0000 1.14 *************** *** 53,57 **** public: ! GlathrielSpot::GlathrielSpot(SpaceLocation *creator, double oangle, SpaceSprite *osprite, int olasernum, int olaserdamage, int olasercolor, double olaserRange, double olasersweep); --- 53,57 ---- public: ! GlathrielSpot(SpaceLocation *creator, double oangle, SpaceSprite *osprite, int olasernum, int olaserdamage, int olasercolor, double olaserRange, double olasersweep); Index: shpdajem.cpp =================================================================== RCS file: /cvsroot/timewarp/source/newships/shpdajem.cpp,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** shpdajem.cpp 28 Aug 2005 20:34:07 -0000 1.17 --- shpdajem.cpp 16 Apr 2007 23:55:32 -0000 1.18 *************** *** 97,101 **** virtual void inflict_damage(SpaceObject *other); virtual int handle_damage(SpaceLocation *source, double normal, double direct); ! virtual bool DajielkaTendril::die(); }; --- 97,101 ---- virtual void inflict_damage(SpaceObject *other); virtual int handle_damage(SpaceLocation *source, double normal, double direct); ! virtual bool die(); }; Index: shpducla.cpp =================================================================== RCS file: /cvsroot/timewarp/source/newships/shpducla.cpp,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** shpducla.cpp 5 Oct 2005 20:20:03 -0000 1.22 --- shpducla.cpp 16 Apr 2007 23:55:32 -0000 1.23 *************** *** 139,143 **** virtual bool die(); ! virtual void ShipPart::collide(SpaceObject *other); // add minor detection part int collide_SpaceObject(SpaceObject *other); --- 139,143 ---- virtual bool die(); ! virtual void collide(SpaceObject *other); // add minor detection part int collide_SpaceObject(SpaceObject *other); Index: shptaugl.cpp =================================================================== RCS file: /cvsroot/timewarp/source/newships/shptaugl.cpp,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** shptaugl.cpp 11 Jul 2005 00:25:32 -0000 1.11 --- shptaugl.cpp 16 Apr 2007 23:55:32 -0000 1.12 *************** *** 53,57 **** public: ! TauGladiusShot::TauGladiusShot (SpaceLocation *creator, Vector2 opos, double oangle, double ov, double orange, double odamage, double olength); virtual void calculate(); virtual void inflict_damage(SpaceObject *other); --- 53,57 ---- public: ! TauGladiusShot (SpaceLocation *creator, Vector2 opos, double oangle, double ov, double orange, double odamage, double olength); virtual void calculate(); virtual void inflict_damage(SpaceObject *other); |
|
From: Yura S. <yu...@us...> - 2007-04-16 23:55:34
|
Update of /cvsroot/timewarp/source/twgui In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv27572/source/twgui Modified Files: gamebuttonevent.h Log Message: TimeWarp now compile using GCC 4.* Index: gamebuttonevent.h =================================================================== RCS file: /cvsroot/timewarp/source/twgui/gamebuttonevent.h,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** gamebuttonevent.h 11 Jul 2005 00:25:59 -0000 1.7 --- gamebuttonevent.h 16 Apr 2007 23:55:32 -0000 1.8 *************** *** 35,39 **** template <class G> ! BEvent<G>::BEvent<G>(G *gg, ftest m1, ftest m2) { g = gg; --- 35,39 ---- template <class G> ! BEvent<G>::BEvent(G *gg, ftest m1, ftest m2) { g = gg; *************** *** 43,47 **** template <class G> ! BEvent<G>::BEvent<G>(G *gg, ftest m1, ftest m2, ftest s1, ftest s2) { g = gg; --- 43,47 ---- template <class G> ! BEvent<G>::BEvent(G *gg, ftest m1, ftest m2, ftest s1, ftest s2) { g = gg; |
|
From: Yura S. <yu...@us...> - 2007-04-16 23:55:34
|
Update of /cvsroot/timewarp/source/sc1ships In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv27572/source/sc1ships Modified Files: shpumgdr.cpp Log Message: TimeWarp now compile using GCC 4.* Index: shpumgdr.cpp =================================================================== RCS file: /cvsroot/timewarp/source/sc1ships/shpumgdr.cpp,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** shpumgdr.cpp 28 Aug 2005 20:32:37 -0000 1.21 --- shpumgdr.cpp 16 Apr 2007 23:55:32 -0000 1.22 *************** *** 22,26 **** virtual void calculate(); virtual void inflict_damage(SpaceObject *other); ! virtual void UmgahCone::animate(Frame* space); virtual int canCollide(SpaceLocation* other); --- 22,26 ---- virtual void calculate(); virtual void inflict_damage(SpaceObject *other); ! virtual void animate(Frame* space); virtual int canCollide(SpaceLocation* other); |
|
From: Yura S. <yu...@us...> - 2007-04-16 23:55:34
|
Update of /cvsroot/timewarp/source/melee In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv27572/source/melee Modified Files: mgame.cpp mgame.h mlog.h mship.h Log Message: TimeWarp now compile using GCC 4.* Index: mgame.h =================================================================== RCS file: /cvsroot/timewarp/source/melee/mgame.h,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** mgame.h 10 Aug 2005 21:07:48 -0000 1.23 --- mgame.h 16 Apr 2007 23:55:32 -0000 1.24 *************** *** 117,121 **** { public: ! NPI::NPI(); virtual ~NPI(); Fleet *fleet; --- 117,121 ---- { public: ! NPI(); virtual ~NPI(); Fleet *fleet; *************** *** 134,137 **** --- 134,138 ---- { public: + virtual ~GameEvent2(){} virtual void calculate(int iplayer){}; }; *************** *** 143,146 **** --- 144,148 ---- public: typedef void (G::* reffunc) (int iplayer); // store the class-function pointer + virtual ~GE(){} G *game; // store pointer to the class in memory Index: mgame.cpp =================================================================== RCS file: /cvsroot/timewarp/source/melee/mgame.cpp,v retrieving revision 1.64 retrieving revision 1.65 diff -C2 -d -r1.64 -r1.65 *** mgame.cpp 18 Jun 2006 13:10:02 -0000 1.64 --- mgame.cpp 16 Apr 2007 23:55:31 -0000 1.65 *************** *** 2341,2345 **** void Game::play_music() {STACKTRACE ! if (-1 == (int)music) return; if (!music) { set_config_file("client.ini"); --- 2341,2345 ---- void Game::play_music() {STACKTRACE ! if ((Music*)-1 == music) return; if (!music) { set_config_file("client.ini"); Index: mlog.h =================================================================== RCS file: /cvsroot/timewarp/source/melee/mlog.h,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** mlog.h 8 Aug 2005 14:35:05 -0000 1.12 --- mlog.h 16 Apr 2007 23:55:32 -0000 1.13 *************** *** 106,110 **** void lint(int *val, int ch = channel_current); void ldata(char *data, int N, int ch = channel_current); ! char *Log::create_buffer(int *size, int ch = channel_current); virtual void force_update() {}; --- 106,110 ---- void lint(int *val, int ch = channel_current); void ldata(char *data, int N, int ch = channel_current); ! char *create_buffer(int *size, int ch = channel_current); virtual void force_update() {}; Index: mship.h =================================================================== RCS file: /cvsroot/timewarp/source/melee/mship.h,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** mship.h 5 Jun 2006 19:03:43 -0000 1.27 --- mship.h 16 Apr 2007 23:55:32 -0000 1.28 *************** *** 44,48 **** public: ! Phaser::Phaser(SpaceLocation *creator, Vector2 pos, Vector2 rel_pos, Ship *ship, SpaceSprite *sprite, int osprite_index, int *ocolors, int onum_colors, int ofsize, int steps, int step_time) ; --- 44,48 ---- public: ! Phaser(SpaceLocation *creator, Vector2 pos, Vector2 rel_pos, Ship *ship, SpaceSprite *sprite, int osprite_index, int *ocolors, int onum_colors, int ofsize, int steps, int step_time) ; *************** *** 64,67 **** --- 64,68 ---- { public: + virtual ~OverrideControl() {} static void add(Ship *s, OverrideControl *newcontrol); static void del(Ship *s, OverrideControl *oldcontrol); |
|
From: Yura S. <yu...@us...> - 2007-04-16 23:55:33
|
Update of /cvsroot/timewarp/source/other In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv27572/source/other Modified Files: vtarget.h Log Message: TimeWarp now compile using GCC 4.* Index: vtarget.h =================================================================== RCS file: /cvsroot/timewarp/source/other/vtarget.h,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** vtarget.h 24 Mar 2004 23:51:44 -0000 1.6 --- vtarget.h 16 Apr 2007 23:55:32 -0000 1.7 *************** *** 41,45 **** double gamma; ! void AimSys::SetupDefaults(void); AimSys(SpaceLocation* sourceP, SpaceLocation* targetP, --- 41,45 ---- double gamma; ! void SetupDefaults(void); AimSys(SpaceLocation* sourceP, SpaceLocation* targetP, |
|
From: Yura S. <yu...@us...> - 2007-04-16 23:55:33
|
Update of /cvsroot/timewarp/source/games In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv27572/source/games Modified Files: gflmelee.cpp ggob.h Log Message: TimeWarp now compile using GCC 4.* Index: ggob.h =================================================================== RCS file: /cvsroot/timewarp/source/games/ggob.h,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** ggob.h 11 Jul 2005 00:25:11 -0000 1.22 --- ggob.h 16 Apr 2007 23:55:31 -0000 1.23 *************** *** 84,88 **** int difficulty; ! virtual bool GobGame::handle_key(int k); --- 84,88 ---- int difficulty; ! virtual bool handle_key(int k); Index: gflmelee.cpp =================================================================== RCS file: /cvsroot/timewarp/source/games/gflmelee.cpp,v retrieving revision 1.32 retrieving revision 1.33 diff -C2 -d -r1.32 -r1.33 *** gflmelee.cpp 29 Jan 2006 21:06:15 -0000 1.32 --- gflmelee.cpp 16 Apr 2007 23:55:31 -0000 1.33 *************** *** 81,85 **** ~ImIndicator(); void newtarget(SpaceLocation *o); ! int ImIndicator::colortype(SpaceLocation *o); void animate(Frame *frame); virtual void calculate(); --- 81,85 ---- ~ImIndicator(); void newtarget(SpaceLocation *o); ! int colortype(SpaceLocation *o); void animate(Frame *frame); virtual void calculate(); |
|
From: Yura S. <yu...@us...> - 2007-04-16 23:55:32
|
Update of /cvsroot/timewarp/source/jgmod In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv27572/source/jgmod Modified Files: jgmod.h Log Message: TimeWarp now compile using GCC 4.* Index: jgmod.h =================================================================== RCS file: /cvsroot/timewarp/source/jgmod/jgmod.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** jgmod.h 2 Jun 2006 14:55:10 -0000 1.1 --- jgmod.h 16 Apr 2007 23:55:31 -0000 1.2 *************** *** 16,24 **** #ifndef ushort ! #define ushort unsigned short #endif #ifndef uint ! #define uint unsigned int #endif --- 16,24 ---- #ifndef ushort ! typedef unsigned short ushort; #endif #ifndef uint ! typedef unsigned int uint; #endif |
|
From: Yura S. <yu...@us...> - 2007-04-16 23:55:32
|
Update of /cvsroot/timewarp/source In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv27572/source Modified Files: melee.h Log Message: TimeWarp now compile using GCC 4.* Index: melee.h =================================================================== RCS file: /cvsroot/timewarp/source/melee.h,v retrieving revision 1.34 retrieving revision 1.35 diff -C2 -d -r1.34 -r1.35 *** melee.h 16 Mar 2006 22:30:29 -0000 1.34 --- melee.h 16 Apr 2007 23:55:31 -0000 1.35 *************** *** 455,459 **** //xxx spacesprite test SpaceSprite(const DATAFILE *sprites, int sprite_count, int attributes = -1, int rotations = 1); ! SpaceSprite::SpaceSprite(BITMAP **bmplist, int sprite_count, int _attributes, int rotations); SpaceSprite(BITMAP *image, int _attributes = -1); SpaceSprite(SpaceSprite &old); --- 455,459 ---- //xxx spacesprite test SpaceSprite(const DATAFILE *sprites, int sprite_count, int attributes = -1, int rotations = 1); ! SpaceSprite(BITMAP **bmplist, int sprite_count, int _attributes, int rotations); SpaceSprite(BITMAP *image, int _attributes = -1); SpaceSprite(SpaceSprite &old); |
|
From: Yura S. <yu...@us...> - 2007-04-16 23:55:32
|
Update of /cvsroot/timewarp In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv27572 Modified Files: .cvsignore scp.ini Log Message: TimeWarp now compile using GCC 4.* Index: .cvsignore =================================================================== RCS file: /cvsroot/timewarp/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** .cvsignore 13 Oct 2003 20:54:47 -0000 1.4 --- .cvsignore 16 Apr 2007 23:55:31 -0000 1.5 *************** *** 1,3 **** *.cache *.log ! --- 1,5 ---- + *.cache *.log ! TimeWarp ! obj Index: scp.ini =================================================================== RCS file: /cvsroot/timewarp/scp.ini,v retrieving revision 1.43 retrieving revision 1.44 diff -C2 -d -r1.43 -r1.44 *** scp.ini 5 Jun 2006 19:16:02 -0000 1.43 --- scp.ini 16 Apr 2007 23:55:31 -0000 1.44 *************** *** 6,15 **** [Config0] ! Thrust = 23 ! Left = 1 ! Right = 4 Fire = 67 AltFire = 63 ! Special = 70 Next_Target = 65 Prev_Target = 66 --- 6,15 ---- [Config0] ! Thrust = 84 ! Left = 82 ! Right = 83 Fire = 67 AltFire = 63 ! Special = 116 Next_Target = 65 Prev_Target = 66 *************** *** 18,22 **** IncLag = 0 ! Backwards = 19 Extra1 = 72 Extra2 = 73 --- 18,22 ---- IncLag = 0 ! Backwards = 85 Extra1 = 72 Extra2 = 73 |
|
From: Yura S. <yu...@us...> - 2007-04-16 23:55:32
|
Update of /cvsroot/timewarp/interfaces/sc1arena In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv27572/interfaces/sc1arena Modified Files: backgr.rledat Log Message: TimeWarp now compile using GCC 4.* Index: backgr.rledat =================================================================== RCS file: /cvsroot/timewarp/interfaces/sc1arena/backgr.rledat,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Binary files /tmp/cvsvgY38p and /tmp/cvsMB9hbQ differ |
|
From: Yura S. <yu...@us...> - 2006-06-24 09:29:17
|
Update of /cvsroot/timewarp In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv20039 Added Files: ChangeLog Log Message: Geomans Campaign: fixed crash when ambasador dies --- NEW FILE: ChangeLog --- 2006-06-24 Yura Semashko <yu...@gm...> * source/games/gmissions.cpp: Fixed crash when ambasador dies |
|
From: Yura S. <yu...@us...> - 2006-06-24 09:29:16
|
Update of /cvsroot/timewarp/source/games In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv20039/source/games Modified Files: gmissions.cpp Log Message: Geomans Campaign: fixed crash when ambasador dies Index: gmissions.cpp =================================================================== RCS file: /cvsroot/timewarp/source/games/gmissions.cpp,v retrieving revision 1.32 retrieving revision 1.33 diff -C2 -d -r1.32 -r1.33 *** gmissions.cpp 2 Jun 2006 13:38:21 -0000 1.32 --- gmissions.cpp 24 Jun 2006 09:29:13 -0000 1.33 *************** *** 1220,1223 **** --- 1220,1228 ---- return; + if (!shp->control) + { + shp->die(); + return; + } // reset the keys for this ship shp->control->keys = 0; |
|
From: Yura S. <yu...@us...> - 2006-06-18 13:10:16
|
Update of /cvsroot/timewarp In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv6689 Modified Files: makefile client.ini Log Message: Fixed linux compilation issues. Code is compiling on amd64 now. Index: client.ini =================================================================== RCS file: /cvsroot/timewarp/client.ini,v retrieving revision 1.36 retrieving revision 1.37 diff -C2 -d -r1.36 -r1.37 *** client.ini 2 Jun 2006 13:38:21 -0000 1.36 --- client.ini 18 Jun 2006 13:10:03 -0000 1.37 *************** *** 77,80 **** [Menu] skin = interfaces/gametest ! SelectGame = 19 --- 77,80 ---- [Menu] skin = interfaces/gametest ! SelectGame = 11 Index: makefile =================================================================== RCS file: /cvsroot/timewarp/makefile,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** makefile 11 Jul 2005 00:25:01 -0000 1.18 --- makefile 18 Jun 2006 13:10:03 -0000 1.19 *************** *** 1,4 **** ############################################################################## ! # Compiling TimeWarp: make {win32=1} {debug=1} {NO_JGMOD=1} # # # # Define win32=1 when compiling with Mingw32 gcc compiler for windows # --- 1,4 ---- ############################################################################## ! # Compiling TimeWarp: make {win32=1} {debug=1} # # # # Define win32=1 when compiling with Mingw32 gcc compiler for windows # *************** *** 15,19 **** ############################################################################## ! CC = g++ LD = g++ CFLAGS = -fsigned-char -Wall -Wno-deprecated-declarations --- 15,20 ---- ############################################################################## ! CXX = g++ ! CC = gcc LD = g++ CFLAGS = -fsigned-char -Wall -Wno-deprecated-declarations *************** *** 22,29 **** VPATH = source source/ais source/games source/games/triggers source/melee \ ! source/newships source/other source/sc1ships source/sc2ships \ source/sc3ships source/twgui source/util source/gamex \ source/gamex/edit source/gamex/general source/gamex/stuff \ ! source/gamex/dialogs source/jpgalleg FILELIST= ${shell find source -type f "(" -name "*.c" -o -name "*.cpp" ")"} --- 23,31 ---- VPATH = source source/ais source/games source/games/triggers source/melee \ ! source/newships source/other source/ppiships source/sc1ships source/sc2ships \ source/sc3ships source/twgui source/util source/gamex \ source/gamex/edit source/gamex/general source/gamex/stuff \ ! source/gamex/dialogs source/jpgalleg source/jgmod source/menu \ ! source/alfont FILELIST= ${shell find source -type f "(" -name "*.c" -o -name "*.cpp" ")"} *************** *** 33,39 **** PDEPS = $(addsuffix .d,$(BASE_NAMES)) ! ARCH = $(shell echo `arch`) ! ifeq ($(ARCH),ppc) ! ARCH = powerpc endif --- 35,48 ---- PDEPS = $(addsuffix .d,$(BASE_NAMES)) ! ifndef win32 ! ARCH := $(shell echo `arch`) ! ifeq ($(ARCH),ppc) ! ARCH = powerpc ! endif ! ifeq ($(ARCH),x86_64) ! ARCH = k8 ! endif ! else ! ARCH := i586 endif *************** *** 45,55 **** NAME := ${addsuffix -debug,$(NAME)} else ! CFLAGS += -O -mcpu=$(ARCH) -s ! endif ! ! ifdef NO_JGMOD ! CFLAGS += -DNO_JGMOD ! else ! LIBS = -ljgmod endif --- 54,58 ---- NAME := ${addsuffix -debug,$(NAME)} else ! CFLAGS += -O -march=$(ARCH) -s endif *************** *** 70,74 **** endif ! CFLAGS += -I./source #CFLAGS += ${addprefix -I./, $(VPATH)} --- 73,77 ---- endif ! CFLAGS += -I./source -I./source/jgmod -I./source/alfont #CFLAGS += ${addprefix -I./, $(VPATH)} *************** *** 99,103 **** $(OBJDIR)/%.o: %.cpp ! $(CC) -MMD $(CFLAGS) -c $< -o $@ $(OBJDIR)/%.o: %.c --- 102,106 ---- $(OBJDIR)/%.o: %.cpp ! $(CXX) -MMD $(CFLAGS) -c $< -o $@ $(OBJDIR)/%.o: %.c |
5 messages has been excluded from this view by a project administrator.
