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
|
|
From: Yura S. <yu...@us...> - 2006-06-18 13:10:12
|
Update of /cvsroot/timewarp/source/util In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv6689/source/util Modified Files: random.cpp pmask.h pmask.c net_tcp.cpp base.cpp aautil.c aastr.h aarot.c Log Message: Fixed linux compilation issues. Code is compiling on amd64 now. Index: aastr.h =================================================================== RCS file: /cvsroot/timewarp/source/util/aastr.h,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** aastr.h 24 Mar 2004 23:51:45 -0000 1.7 --- aastr.h 18 Jun 2006 13:10:01 -0000 1.8 *************** *** 202,214 **** // Rotation. void aa_rotate_scaled_bitmap (BITMAP* src, BITMAP* dst, ! int x, int y, long angle, ! long scalex, long scaley); void aa_rotate_scaled_sprite (BITMAP* dst, BITMAP* src, ! int x, int y, long angle, ! long scalex, long scaley); void aa_rotate_bitmap (BITMAP* src, BITMAP* dst, ! int x, int y, long angle); void aa_rotate_sprite (BITMAP* dst, BITMAP* src, ! int x, int y, long angle); --- 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); Index: net_tcp.cpp =================================================================== RCS file: /cvsroot/timewarp/source/util/net_tcp.cpp,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** net_tcp.cpp 1 Aug 2005 10:46:35 -0000 1.14 --- net_tcp.cpp 18 Jun 2006 13:10:01 -0000 1.15 *************** *** 208,212 **** # if defined NETWORK_WEIRD_SIGNEDNESS //WTF!?! ! size_t tmp; //some linuxes (but not the version superdave uses (slackware of some //kind)) require this, even though some linux documentation contradicts --- 208,212 ---- # if defined NETWORK_WEIRD_SIGNEDNESS //WTF!?! ! socklen_t tmp; //some linuxes (but not the version superdave uses (slackware of some //kind)) require this, even though some linux documentation contradicts Index: random.cpp =================================================================== RCS file: /cvsroot/timewarp/source/util/random.cpp,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** random.cpp 15 Mar 2006 13:02:12 -0000 1.11 --- random.cpp 18 Jun 2006 13:10:01 -0000 1.12 *************** *** 298,302 **** } ! int k = int( tw_random_unsigned() % unsigned int(a) ); if (k < 0 || k >= a) --- 298,303 ---- } ! // int k = int( tw_random_unsigned() % unsigned int(a) ); ! int k = int( tw_random_unsigned() % int(a) ); if (k < 0 || k >= a) Index: pmask.c =================================================================== RCS file: /cvsroot/timewarp/source/util/pmask.c,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** pmask.c 27 Sep 2005 22:03:56 -0000 1.10 --- pmask.c 18 Jun 2006 13:10:01 -0000 1.11 *************** *** 61,65 **** #define COMPILE_TIME_ASSERT(condition) typedef char _compile_time_assert__[(condition) ? 1 : -1]; void install_pmask() { ! COMPILE_TIME_ASSERT((1 << MASK_WORD_BITBITS) == MASK_WORD_BITS); return; } --- 61,65 ---- #define COMPILE_TIME_ASSERT(condition) typedef char _compile_time_assert__[(condition) ? 1 : -1]; void install_pmask() { ! COMPILE_TIME_ASSERT((1 << MASK_WORD_BITBITS) == MASK_WORD_BITS); return; } Index: base.cpp =================================================================== RCS file: /cvsroot/timewarp/source/util/base.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** base.cpp 11 Jul 2005 00:26:07 -0000 1.8 --- base.cpp 18 Jun 2006 13:10:01 -0000 1.9 *************** *** 9,13 **** 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)() ) { --- 9,13 ---- 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)() ) { Index: aarot.c =================================================================== RCS file: /cvsroot/timewarp/source/util/aarot.c,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** aarot.c 24 Mar 2004 23:51:45 -0000 1.5 --- aarot.c 18 Jun 2006 13:10:01 -0000 1.6 *************** *** 30,35 **** */ void ! _aa_rotate_bitmap (BITMAP *_src, BITMAP *_dst, int _x, int _y, fixed _angle, ! fixed _scalex, fixed _scaley, int _mode) { int sw, sh, dw, dh; --- 30,35 ---- */ void ! _aa_rotate_bitmap (BITMAP *_src, BITMAP *_dst, int _x, int _y, long _angle, ! long _scalex, long _scaley, int _mode) { int sw, sh, dw, dh; Index: pmask.h =================================================================== RCS file: /cvsroot/timewarp/source/util/pmask.h,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** pmask.h 15 Sep 2005 09:03:09 -0000 1.6 --- pmask.h 18 Jun 2006 13:10:01 -0000 1.7 *************** *** 51,55 **** --- 51,60 ---- //don't worry about setting it incorrectly //you'll get a compile error if you do, not a run-time error + + #if ULONG_MAX == 0xFFFFFFFFUL #define MASK_WORD_BITBITS 5 + #else + #define MASK_WORD_BITBITS 6 + #endif Index: aautil.c =================================================================== RCS file: /cvsroot/timewarp/source/util/aautil.c,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** aautil.c 26 Mar 2004 17:55:49 -0000 1.7 --- aautil.c 18 Jun 2006 13:10:01 -0000 1.8 *************** *** 1,3 **** - /* $Id$ */ /* modified by orz for Star Control: TimeWarp Lots of features added, large code re-organization, etc. --- 1,2 ---- *************** *** 19,22 **** --- 18,24 ---- */ + #include <stdio.h> + #include <stdlib.h> + #include "types.h" #include "aautil.h" *************** *** 53,57 **** */ ! #define bit(a) (1 << a) #define bitn(a) (bit(a)-1) --- 55,59 ---- */ ! #define bit(a) (1 << (a)) #define bitn(a) (bit(a)-1) *************** *** 94,100 **** #define BLENDER32_WITH_A(bpp,bpp2) {int c2;c=makecol24(r,g,b);c2=bmp_read##bpp(_addr+_x*((bpp+7)/8));c=_blender_func_24(makecol24(getr##bpp2(c2),getg##bpp2(c2),getb##bpp2(c2)), c, (_aa.trans * _aa.trans) >> 8);r=getr24(c);g=getg24(c);b=getb32(c); //these macros output the color to the screen #define PUT(bpp,bpp2) bmp_write##bpp(_addr+_x*((bpp+7)/8), c); ! #define PUT_8X(bpp,bpp2) outportw(0x3C4, (0x100<<(_x&3))|2); bmp_write8(_addr + (_x>>2), c); #define PUT_N(bpp,bpp2) putpixel(_aa.destination, _x, _aa.y, c); //parameters ignored for 8X & N --- 96,103 ---- #define BLENDER32_WITH_A(bpp,bpp2) {int c2;c=makecol24(r,g,b);c2=bmp_read##bpp(_addr+_x*((bpp+7)/8));c=_blender_func_24(makecol24(getr##bpp2(c2),getg##bpp2(c2),getb##bpp2(c2)), c, (_aa.trans * _aa.trans) >> 8);r=getr24(c);g=getg24(c);b=getb32(c); + //these macros output the color to the screen #define PUT(bpp,bpp2) bmp_write##bpp(_addr+_x*((bpp+7)/8), c); ! //#define PUT_8X(bpp,bpp2) outportw(0x3C4, (0x100<<(_x&3))|2); bmp_write8(_addr + (_x>>2), c); #define PUT_N(bpp,bpp2) putpixel(_aa.destination, _x, _aa.y, c); //parameters ignored for 8X & N *************** *** 185,201 **** //no alpha-dither-notrans ! #ifdef GFX_MODEX ! //macro name bpp/2 ALPHA DITHER NOTRANS PUT ! MAKE_PUTFUNC( _aa_put_modex_8 ,8,8, NONE, NO_DITHER, NONE, PUT_8X) ! MAKE_PUTFUNC( _aa_put_modex_dither_8 ,8,8, NONE, DITHER, NONE, PUT_8X) ! MAKE_PUTFUNC( _aa_put_modex_alpha_8 ,8,8, ALPHA, NO_DITHER, NONE, PUT_8X) ! MAKE_PUTFUNC( _aa_put_modex_alpha_dither_8 ,8,8, ALPHA, DITHER, NONE, PUT_8X) ! PUT_TYPE *put_array_modex[4] = { ! _aa_put_modex_8, ! _aa_put_modex_dither_8, ! _aa_put_modex_alpha_8, ! _aa_put_modex_alpha_dither_8 ! }; ! #endif #ifdef ALLEGRO_COLOR16 --- 188,192 ---- //no alpha-dither-notrans ! #ifdef ALLEGRO_COLOR16 *************** *** 366,369 **** --- 357,361 ---- if (options & AA_MASKED_DEST) j += 4; + #if 0 # ifdef GFX_MODEX if (is_planar_bitmap(destination)) { *************** *** 372,375 **** --- 364,368 ---- } # endif + #endif if (options & AA_RAW_ALPHA) { |
|
From: Yura S. <yu...@us...> - 2006-06-18 13:10:11
|
Update of /cvsroot/timewarp/source/melee In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv6689/source/melee Modified Files: mgame.cpp Log Message: Fixed linux compilation issues. Code is compiling on amd64 now. Index: mgame.cpp =================================================================== RCS file: /cvsroot/timewarp/source/melee/mgame.cpp,v retrieving revision 1.63 retrieving revision 1.64 diff -C2 -d -r1.63 -r1.64 *** mgame.cpp 22 Apr 2006 09:32:21 -0000 1.63 --- mgame.cpp 18 Jun 2006 13:10:02 -0000 1.64 *************** *** 1370,1374 **** int check_game_time = get_time(); ! static av_frame_time = 0; --- 1370,1374 ---- int check_game_time = get_time(); ! static int av_frame_time = 0; |
|
From: Yura S. <yu...@us...> - 2006-06-18 13:10:09
|
Update of /cvsroot/timewarp/source/other In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv6689/source/other Modified Files: ttf.cpp Log Message: Fixed linux compilation issues. Code is compiling on amd64 now. Index: ttf.cpp =================================================================== RCS file: /cvsroot/timewarp/source/other/ttf.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** ttf.cpp 2 Jun 2006 14:55:52 -0000 1.8 --- ttf.cpp 18 Jun 2006 13:10:02 -0000 1.9 *************** *** 88,92 **** // for debugging (copied from allegro) ! static void color_destroy_font(FONT* f) { FONT_COLOR_DATA* cf; --- 88,92 ---- // for debugging (copied from allegro) ! void color_destroy_font(FONT* f) { FONT_COLOR_DATA* cf; *************** *** 430,434 **** * mono; if bg == -1, render as transparent, else render as opaque. */ ! static void color_render_props(AL_CONST FONT* f, AL_CONST char* text, int fg, int bg, BITMAP* bmp, int x, int y) { if (!color_props) --- 430,434 ---- * mono; if bg == -1, render as transparent, else render as opaque. */ ! void color_render_props(AL_CONST FONT* f, AL_CONST char* text, int fg, int bg, BITMAP* bmp, int x, int y) { if (!color_props) |
|
From: Yura S. <yu...@us...> - 2006-06-18 13:10:09
|
Update of /cvsroot/timewarp/source/jgmod In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv6689/source/jgmod Modified Files: jgmod.c Added Files: player4.c player3.c player2.c player.c Log Message: Fixed linux compilation issues. Code is compiling on amd64 now. Index: jgmod.c =================================================================== RCS file: /cvsroot/timewarp/source/jgmod/jgmod.c,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** jgmod.c 2 Jun 2006 14:55:10 -0000 1.1 --- jgmod.c 18 Jun 2006 13:10:03 -0000 1.2 *************** *** 19,22 **** --- 19,24 ---- + #if 0 + #include <stdio.h> #include <time.h> *************** *** 322,323 **** --- 324,326 ---- textprintf (screen, font, 0,24, font_color, "No Tracks : %2d No Patterns : %2d No Sample : %2d ", the_mod->no_trk, the_mod->no_pat, the_mod->no_sample); } + #endif --- NEW FILE: player.c --- /* * * _______ _______ __________ _______ _____ * /____ / / _____/ / / / ___ / / ___ \ * __ / / / / ____ / // // / / / / / / / / / * / /_/ / / /__/ / / / /_/ / / / /__/ / / /__/ / * /______/ /______/ /_/ /_/ /______/ /______/ * * * * Guan Foo Wah * 18, SS 17 / 1H * 47500 Subang Jaya * Selangor * Malaysia * * * The core of MOD player. */ #include <stdio.h> #include <allegro.h> #include "jgmod.h" #include "jshare.h" #define speed_ratio mi.speed_ratio / 100 #define pitch_ratio mi.pitch_ratio / 100 volatile MUSIC_INFO mi; volatile CHANNEL_INFO ci[MAX_ALLEG_VOICE]; int volatile mod_volume = 255; JGMOD *of=null; // -- Prototypes ------------------------------------------------------------- void lock_jgmod_stuff (void); // the core of the mod player. void mod_interrupt (void) { int chn=0; int sample_no; SAMPLE_INFO *si=null; SAMPLE *s= null; NOTE_INFO *ni=null; PATTERN_INFO *pi; if (of == null) //return if not playing music return; if (mi.forbid == TRUE) return; if (mi.pause == TRUE) //return if music is paused return; // prev_pattern() or next_pattern() if (mi.skip_pos) { mi.pos = mi.skip_pos-1; mi.trk = mi.skip_trk-1; mi.pat = *(of->pat_table + mi.trk); mi.tick = -1; mi.skip_pos = 0; mi.skip_trk = 0; mi.new_pos = 0; mi.new_trk = 0; for (chn=0; chn<mi.max_chn; chn++) { ci[chn].slide2period = 0; ci[chn].loop_start = 0; ci[chn].loop_times = 0; } // cut all the samples; for (chn=0; chn<mi.max_chn; chn++) { ci[chn].volume = 0; voice_set_volume (voice_table[chn], 0); voice_stop (voice_table[chn]); } if (mi.trk == 0) // restart the song if trk 0 { play_mod (of, mi.loop); return; } } mi.tick++; if (mi.tick >= mi.tempo) if (mi.pattern_delay > 0) { mi.pattern_delay--; return; } if (mi.tick >= mi.tempo) { mi.tick = 0; // those darn pattern loop for (chn=0; chn<(of->no_chn); chn++) { if (chn >= mi.max_chn) continue; if (ci[chn].loop_on == FALSE) continue; if (ci[chn].loop_times > 0) { mi.new_pos = ci[chn].loop_start+1; mi.new_trk = mi.trk+1; } } if (mi.new_pos) //if pattern break or position jump { mi.pos = mi.new_pos-1; mi.trk = mi.new_trk-1; mi.pat = *(of->pat_table + mi.trk); mi.new_pos = 0; mi.new_trk = 0; } else { mi.pos++; pi = of->pi + mi.pat; if (mi.pos >= pi->no_pos) { mi.pos = 0; mi.trk++; mi.pat = *(of->pat_table + mi.trk); for (chn=0; chn<mi.max_chn; chn++) { ci[chn].loop_start = 0; ci[chn].loop_times = 0; } } } } if (mi.trk >= of->no_trk) //check for end of song { for (chn=0; chn<mi.max_chn; chn++) voice_stop (voice_table[chn]); if (mi.loop == FALSE) // end the song { of = null; mi.is_playing = FALSE; return; } else { play_mod (of, TRUE); // restart the song goto_mod_track (of->restart_pos); return; } } if (mi.tick == 0) { for (chn=0; chn<(of->no_chn); chn++) { ci[chn].global_volume_slide_on = FALSE; ni = get_note (of, mi.pat, mi.pos, chn); if (chn<MAX_ALLEG_VOICE) ci[chn].loop_on = FALSE; // these are global commands. Should not be skipped if (ni->command == PTEFFECT_B) //position jump do_position_jump (ni->extcommand); else if (ni->command == PTEFFECT_D) //pattern break do_pattern_break (ni->extcommand); else if (ni->command == PTEFFECT_F) //set tempo or bpm do_pro_tempo_bpm (ni->extcommand); else if (ni->command == S3EFFECT_A) // S3M set tempo do_s3m_set_tempo (ni->extcommand); else if (ni->command == S3EFFECT_T) // S3M set bpm do_s3m_set_bpm (ni->extcommand); else if (ni->command == S3EFFECT_V) // set global volume do_global_volume (ni->extcommand); else if (ni->command == XMEFFECT_H && (chn < MAX_ALLEG_VOICE) ) // global volume slide parse_global_volume_slide (chn, ni->extcommand); // pattern loop else if ( (ni->command == PTEFFECT_E) && (ni->extcommand >> 4 == 6 ) && (chn < MAX_ALLEG_VOICE)) do_pattern_loop (chn, ni->extcommand); // pattern delay else if ( (ni->command == 14) && (ni->extcommand >> 4 == 14 ) ) mi.pattern_delay = mi.tempo * (ni->extcommand & 0xF); } // the following are not global commands. Can be skipped for (chn=0; chn<(of->no_chn); chn++) { if (chn >= mi.max_chn) continue; ni = get_note (of, mi.pat, mi.pos, chn); ci[chn].pan_slide_common = 0; ci[chn].pro_pitch_slide_on = FALSE; ci[chn].s3m_volume_slide_on = FALSE; ci[chn].xm_volume_slide_on = FALSE; ci[chn].xm_pitch_slide_down_on = FALSE; ci[chn].xm_pitch_slide_up_on = FALSE; ci[chn].s3m_pitch_slide_on = FALSE; ci[chn].sample_offset_on = FALSE; ci[chn].slide2period_on = FALSE; ci[chn].s3m_retrig_on = FALSE; ci[chn].arpeggio_on = FALSE; ci[chn].vibrato_on = FALSE; ci[chn].tremolo_on = FALSE; ci[chn].tremor_on = FALSE; ci[chn].kick = FALSE; ci[chn].delay_sample = 0; ci[chn].cut_sample = 0; ci[chn].pro_volume_slide = 0; ci[chn].retrig = 0; sample_no = ni->sample - 1; if ( (sample_no >= 0) && ((ni->command == PTEFFECT_3) || (ni->command == PTEFFECT_5) || (ni->command == XMEFFECT_5) || ( (ni->volume & 0xF0) == 0xF0)) ) { if (mi.flag & XM_MODE) { SAMPLE_INFO *si; si = of->si + get_jgmod_sample_no (sample_no, ci[chn].note); ci[chn].volume = si->volume; } else ci[chn].volume = of->si[sample_no].volume; } if ( (ni->note > 0 || sample_no >= 0) && (ni->command != PTEFFECT_3) && (ni->command != PTEFFECT_5) && (ni->command != XMEFFECT_5) && ( (ni->volume & 0xF0) != 0xF0 ) ) { ci[chn].tremor_count = 0; ci[chn].slide2period = 0; if (ci[chn].vibrato_waveform <= 2) ci[chn].vibrato_pointer = 0; if (ci[chn].tremolo_waveform <= 2) ci[chn].tremolo_pointer = 0; if (mi.flag & XM_MODE) parse_new_note (chn, ni->note, sample_no); else parse_old_note (chn, ni->note, sample_no); } if (ni->note < 0) parse_note_command (chn, ni->note); if (ni->volume >= 0x10) parse_volume_command (chn, ni->volume, ni->note); if (ni->command == PTEFFECT_0) // mod arpeggio parse_pro_arpeggio (chn, ni->extcommand); else if (ni->command == PTEFFECT_1) // pitch slide up parse_pro_pitch_slide_up (chn, ni->extcommand); else if (ni->command == PTEFFECT_2) // pitch slide down parse_pro_pitch_slide_down (chn, ni->extcommand); else if (ni->command == PTEFFECT_3) // slide to note parse_slide2period (chn, ni->extcommand, (ni->note > 0) ? ni->note+ci[chn].transpose : 0); else if (ni->command == PTEFFECT_4) // vibrato parse_vibrato (chn, ni->extcommand, 5); else if (ni->command == PTEFFECT_5) // slide to note + volume slide { parse_slide2period (chn, 0, ni->note); parse_pro_volume_slide (chn, ni->extcommand); } else if (ni->command == PTEFFECT_6) // vibrato + volume slide { parse_vibrato (chn, 0, 5); parse_pro_volume_slide (chn, ni->extcommand); } else if (ni->command == PTEFFECT_7) // tremolo parse_tremolo (chn, ni->extcommand, 6); else if (ni->command == PTEFFECT_8) // set pan ci[chn].pan = ni->extcommand; else if (ni->command == PTEFFECT_9) // sample offset { if ((ni->note > 0) || (ni->sample-1 >= 0)) { ci[chn].sample_offset_on = TRUE; ci[chn].kick = TRUE; if (ni->extcommand) ci[chn].sample_offset = (ni->extcommand << 8); } } else if (ni->command == PTEFFECT_A) // volume_slide parse_pro_volume_slide (chn, ni->extcommand); else if (ni->command == PTEFFECT_C) // set volume ci[chn].volume = ni->extcommand; else if (ni->command == PTEFFECT_E) // extended effects parse_extended_command (chn, ni->extcommand); else if (ni->command == S3EFFECT_D) // s3m volume slide parse_s3m_volume_slide (chn, ni->extcommand); else if (ni->command == S3EFFECT_E) // s3m porta down parse_s3m_portamento_down(chn, ni->extcommand); else if (ni->command == S3EFFECT_F) // s3m porta up parse_s3m_portamento_up (chn, ni->extcommand); else if (ni->command == S3EFFECT_I) // tremor parse_tremor (chn, ni->extcommand); else if (ni->command == S3EFFECT_J) // s3m arpeggio parse_s3m_arpeggio (chn, ni->extcommand); else if (ni->command == S3EFFECT_K) // vibrato + vol slide { parse_vibrato (chn, 0, 5); parse_s3m_volume_slide (chn, ni->extcommand); } else if (ni->command == S3EFFECT_L) // porta + vol slide { parse_slide2period (chn, 0, ni->note); parse_s3m_volume_slide (chn, ni->extcommand); } else if (ni->command == S3EFFECT_Q) // multi retrig parse_s3m_retrig(chn, ni->extcommand); else if (ni->command == S3EFFECT_R) // s3m tremolo parse_tremolo (chn, ni->extcommand, 7); else if (ni->command == S3EFFECT_U) // fine vibrato parse_vibrato (chn, ni->extcommand, 7); else if (ni->command == S3EFFECT_X) // s3m set panning parse_s3m_panning (chn, ni->extcommand); else if (ni->command == XMEFFECT_1) // xm porta up parse_xm_pitch_slide_up (chn, ni->extcommand); else if (ni->command == XMEFFECT_2) // xm porta down parse_xm_pitch_slide_down (chn, ni->extcommand); else if (ni->command == XMEFFECT_5) // slide to note + vol slide { parse_slide2period (chn, 0, (ni->note > 0) ? ni->note+ci[chn].transpose : 0); parse_xm_volume_slide (chn, ni->extcommand); } else if (ni->command == XMEFFECT_6) // vibrato + XM vol slide { parse_vibrato (chn, 0, 5); parse_xm_volume_slide (chn, ni->extcommand); } else if (ni->command == XMEFFECT_A) // xm volume slide parse_xm_volume_slide (chn, ni->extcommand); else if (ni->command == XMEFFECT_P) // xm panning slide parse_xm_pan_slide(chn, ni->extcommand); else if (ni->command == XMEFFECT_K) // key off { ci[chn].keyon = TRUE; if ( (ci[chn].volenv.flg & ENV_ON) == 0) ci[chn].volume = 0; } else if (ni->command == XMEFFECT_L) // Set envelop position parse_xm_set_envelop_position (&ci[chn].volenv, ni->extcommand); else if (ni->command == XMEFFECT_X) // extra fine porta do_xm_x (chn, ni->extcommand); ci[chn].temp_pan = ci[chn].pan; ci[chn].temp_volume = ci[chn].volume; ci[chn].temp_period = ci[chn].period; } } // -- effects updated only after tick 0 -------------------------------------- if (mi.tick) { for (chn=0; chn < (of->no_chn); chn++) { if (chn >= mi.max_chn) continue; if (ci[chn].s3m_retrig_on == TRUE) do_s3m_retrig (chn); if (ci[chn].arpeggio_on == TRUE) do_arpeggio (chn); if (ci[chn].pro_pitch_slide_on == TRUE) { ci[chn].period += ci[chn].pro_pitch_slide; ci[chn].temp_period += ci[chn].pro_pitch_slide; } if (ci[chn].pro_volume_slide) { ci[chn].volume += ci[chn].pro_volume_slide; ci[chn].temp_volume += ci[chn].pro_volume_slide; } if (ci[chn].retrig) { if ((mi.tick % ci[chn].retrig) == 0) ci[chn].kick = TRUE; } if (ci[chn].cut_sample) { if (mi.tick == ci[chn].cut_sample) { ci[chn].volume = 0; ci[chn].temp_volume = 0; } } if (ci[chn].slide2period_on == TRUE) do_slide2period(chn); if (ci[chn].delay_sample) do_delay_sample(chn); if (ci[chn].tremor_on == TRUE) do_tremor (chn); if (ci[chn].xm_volume_slide_on == TRUE) do_xm_volume_slide (chn); if (ci[chn].xm_pitch_slide_up_on == TRUE) do_xm_pitch_slide_up (chn); if (ci[chn].xm_pitch_slide_down_on == TRUE) do_xm_pitch_slide_down (chn); if (ci[chn].pan_slide_common) do_xm_pan_slide (chn); if (ci[chn].global_volume_slide_on == TRUE) do_global_volume_slide (chn); } } // -- effects updated every tick --------------------------------------------- for (chn=0; chn < (of->no_chn); chn++) { if (chn >= mi.max_chn) continue; if (ci[chn].vibrato_on == TRUE) do_vibrato (chn); if (ci[chn].tremolo_on == TRUE) do_tremolo (chn); if (ci[chn].s3m_volume_slide_on == TRUE) do_s3m_volume_slide (chn); if (ci[chn].s3m_pitch_slide_on == TRUE) do_s3m_portamento (chn); } //-- updates the sound output ------------------------------------------------ for (chn=0; chn < (of->no_chn); chn++) { if (chn >= mi.max_chn) continue; if (ci[chn].delay_sample) continue; if (ci[chn].temp_period < 4) ci[chn].temp_period = 4; if (ci[chn].volume < 0) ci[chn].volume = 0; else if (ci[chn].volume > 64) ci[chn].volume = 64; if (ci[chn].temp_volume < 0) ci[chn].temp_volume = 0; else if (ci[chn].temp_volume > 64) ci[chn].temp_volume = 64; if (ci[chn].pan < 0) ci[chn].pan = 0; else if (ci[chn].pan > 255) ci[chn].pan = 255; if (ci[chn].temp_pan < 0) ci[chn].temp_pan = 0; else if (ci[chn].temp_pan > 255) ci[chn].temp_pan = 255; if (ci[chn].kick == TRUE) // start a sample { s = of->s + ci[chn].sample; si= of->si + ci[chn].sample; reallocate_voice (voice_table[chn], s); if (si->loop & LOOP_ON) voice_set_playmode (voice_table[chn], PLAYMODE_LOOP); if (si->loop & LOOP_BIDI) voice_set_playmode (voice_table[chn], PLAYMODE_BIDIR|PLAYMODE_LOOP); //voice_start(voice_table[chn]); //ci[chn].kick = FALSE; } if (ci[chn].sample_offset_on == TRUE) { voice_set_position (voice_table[chn], ci[chn].sample_offset); ci[chn].sample_offset_on = FALSE; } if (ci[chn].period > 0) voice_set_frequency (voice_table[chn], period2pitch (ci[chn].temp_period) * pitch_ratio); process_envelope (&ci[chn].volenv, 64, ci[chn].keyon); process_envelope (&ci[chn].panenv, 32, ci[chn].keyon); voice_set_volume (voice_table[chn], calc_volume (chn)); voice_set_pan (voice_table[chn], calc_pan (chn)); if (ci[chn].keyon == TRUE) { ci[chn].volfade -= ci[chn].instfade; if (ci[chn].volfade < 0) ci[chn].volfade = 0; } if (ci[chn].kick == TRUE) { voice_start(voice_table[chn]); ci[chn].kick = FALSE; } } } END_OF_FUNCTION (mod_interrupt) // to lock stuff in player.c void lock_jgmod_player (void) { LOCK_FUNCTION(mod_interrupt); LOCK_VARIABLE(mi); LOCK_VARIABLE(mod_volume); LOCK_VARIABLE (of); #ifdef __ALLEGRO_DJGPP__ _go32_dpmi_lock_data((void *)ci, sizeof(ci) * MAX_ALLEG_VOICE); #endif } --- NEW FILE: player2.c --- /* * * _______ _______ __________ _______ _____ * /____ / / _____/ / / / ___ / / ___ \ * __ / / / / ____ / // // / / / / / / / / / * / /_/ / / /__/ / / / /_/ / / / /__/ / / /__/ / * /______/ /______/ /_/ /_/ /______/ /______/ * * * * Guan Foo Wah * 18, SS 17 / 1H * 47500 Subang Jaya * Selangor * Malaysia * * * Protracker effects and misc stuff are located here */ #include <math.h> #include <allegro.h> #include "jgmod.h" #include "jshare.h" #define speed_ratio mi.speed_ratio / 100 #define pitch_ratio mi.pitch_ratio / 100 #define LOGFAC 32 extern volatile int mod_finetune[]; int find_lower_period(int period, int times); // for converting linear period to frequency static unsigned long lintab[768] = { 535232,534749,534266,533784,533303,532822,532341,531861, 531381,530902,530423,529944,529466,528988,528511,528034, 527558,527082,526607,526131,525657,525183,524709,524236, 523763,523290,522818,522346,521875,521404,520934,520464, 519994,519525,519057,518588,518121,517653,517186,516720, 516253,515788,515322,514858,514393,513929,513465,513002, 512539,512077,511615,511154,510692,510232,509771,509312, 508852,508393,507934,507476,507018,506561,506104,505647, 505191,504735,504280,503825,503371,502917,502463,502010, 501557,501104,500652,500201,499749,499298,498848,498398, 497948,497499,497050,496602,496154,495706,495259,494812, 494366,493920,493474,493029,492585,492140,491696,491253, 490809,490367,489924,489482,489041,488600,488159,487718, 487278,486839,486400,485961,485522,485084,484647,484210, 483773,483336,482900,482465,482029,481595,481160,480726, 480292,479859,479426,478994,478562,478130,477699,477268, 476837,476407,475977,475548,475119,474690,474262,473834, 473407,472979,472553,472126,471701,471275,470850,470425, 470001,469577,469153,468730,468307,467884,467462,467041, 466619,466198,465778,465358,464938,464518,464099,463681, 463262,462844,462427,462010,461593,461177,460760,460345, 459930,459515,459100,458686,458272,457859,457446,457033, 456621,456209,455797,455386,454975,454565,454155,453745, 453336,452927,452518,452110,451702,451294,450887,450481, 450074,449668,449262,448857,448452,448048,447644,447240, 446836,446433,446030,445628,445226,444824,444423,444022, 443622,443221,442821,442422,442023,441624,441226,440828, 440430,440033,439636,439239,438843,438447,438051,437656, 437261,436867,436473,436079,435686,435293,434900,434508, 434116,433724,433333,432942,432551,432161,431771,431382, 430992,430604,430215,429827,429439,429052,428665,428278, 427892,427506,427120,426735,426350,425965,425581,425197, 424813,424430,424047,423665,423283,422901,422519,422138, 421757,421377,420997,420617,420237,419858,419479,419101, 418723,418345,417968,417591,417214,416838,416462,416086, 415711,415336,414961,414586,414212,413839,413465,413092, 412720,412347,411975,411604,411232,410862,410491,410121, 409751,409381,409012,408643,408274,407906,407538,407170, 406803,406436,406069,405703,405337,404971,404606,404241, 403876,403512,403148,402784,402421,402058,401695,401333, 400970,400609,400247,399886,399525,399165,398805,398445, 398086,397727,397368,397009,396651,396293,395936,395579, 395222,394865,394509,394153,393798,393442,393087,392733, 392378,392024,391671,391317,390964,390612,390259,389907, 389556,389204,388853,388502,388152,387802,387452,387102, 386753,386404,386056,385707,385359,385012,384664,384317, 383971,383624,383278,382932,382587,382242,381897,381552, 381208,380864,380521,380177,379834,379492,379149,378807, 378466,378124,377783,377442,377102,376762,376422,376082, 375743,375404,375065,374727,374389,374051,373714,373377, 373040,372703,372367,372031,371695,371360,371025,370690, 370356,370022,369688,369355,369021,368688,368356,368023, 367691,367360,367028,366697,366366,366036,365706,365376, 365046,364717,364388,364059,363731,363403,363075,362747, 362420,362093,361766,361440,361114,360788,360463,360137, 359813,359488,359164,358840,358516,358193,357869,357547, 357224,356902,356580,356258,355937,355616,355295,354974, 354654,354334,354014,353695,353376,353057,352739,352420, 352103,351785,351468,351150,350834,350517,350201,349885, 349569,349254,348939,348624,348310,347995,347682,347368, 347055,346741,346429,346116,345804,345492,345180,344869, 344558,344247,343936,343626,343316,343006,342697,342388, 342079,341770,341462,341154,340846,340539,340231,339924, 339618,339311,339005,338700,338394,338089,337784,337479, 337175,336870,336566,336263,335959,335656,335354,335051, 334749,334447,334145,333844,333542,333242,332941,332641, 332341,332041,331741,331442,331143,330844,330546,330247, 329950,329652,329355,329057,328761,328464,328168,327872, 327576,327280,326985,326690,326395,326101,325807,325513, 325219,324926,324633,324340,324047,323755,323463,323171, 322879,322588,322297,322006,321716,321426,321136,320846, 320557,320267,319978,319690,319401,319113,318825,318538, 318250,317963,317676,317390,317103,316817,316532,316246, 315961,315676,315391,315106,314822,314538,314254,313971, 313688,313405,313122,312839,312557,312275,311994,311712, 311431,311150,310869,310589,310309,310029,309749,309470, 309190,308911,308633,308354,308076,307798,307521,307243, 306966,306689,306412,306136,305860,305584,305308,305033, 304758,304483,304208,303934,303659,303385,303112,302838, 302565,302292,302019,301747,301475,301203,300931,300660, 300388,300117,299847,299576,299306,299036,298766,298497, 298227,297958,297689,297421,297153,296884,296617,296349, 296082,295815,295548,295281,295015,294749,294483,294217, 293952,293686,293421,293157,292892,292628,292364,292100, 291837,291574,291311,291048,290785,290523,290261,289999, 289737,289476,289215,288954,288693,288433,288173,287913, 287653,287393,287134,286875,286616,286358,286099,285841, 285583,285326,285068,284811,284554,284298,284041,283785, 283529,283273,283017,282762,282507,282252,281998,281743, 281489,281235,280981,280728,280475,280222,279969,279716, 279464,279212,278960,278708,278457,278206,277955,277704, 277453,277203,276953,276703,276453,276204,275955,275706, 275457,275209,274960,274712,274465,274217,273970,273722, 273476,273229,272982,272736,272490,272244,271999,271753, 271508,271263,271018,270774,270530,270286,270042,269798, 269555,269312,269069,268826,268583,268341,268099,267857 }; // for converting note to amiga period static volatile ushort logtab[]={ LOGFAC*907,LOGFAC*900,LOGFAC*894,LOGFAC*887,LOGFAC*881,LOGFAC*875,LOGFAC*868,LOGFAC*862, LOGFAC*856,LOGFAC*850,LOGFAC*844,LOGFAC*838,LOGFAC*832,LOGFAC*826,LOGFAC*820,LOGFAC*814, LOGFAC*808,LOGFAC*802,LOGFAC*796,LOGFAC*791,LOGFAC*785,LOGFAC*779,LOGFAC*774,LOGFAC*768, LOGFAC*762,LOGFAC*757,LOGFAC*752,LOGFAC*746,LOGFAC*741,LOGFAC*736,LOGFAC*730,LOGFAC*725, LOGFAC*720,LOGFAC*715,LOGFAC*709,LOGFAC*704,LOGFAC*699,LOGFAC*694,LOGFAC*689,LOGFAC*684, LOGFAC*678,LOGFAC*675,LOGFAC*670,LOGFAC*665,LOGFAC*660,LOGFAC*655,LOGFAC*651,LOGFAC*646, LOGFAC*640,LOGFAC*636,LOGFAC*632,LOGFAC*628,LOGFAC*623,LOGFAC*619,LOGFAC*614,LOGFAC*610, LOGFAC*604,LOGFAC*601,LOGFAC*597,LOGFAC*592,LOGFAC*588,LOGFAC*584,LOGFAC*580,LOGFAC*575, LOGFAC*570,LOGFAC*567,LOGFAC*563,LOGFAC*559,LOGFAC*555,LOGFAC*551,LOGFAC*547,LOGFAC*543, LOGFAC*538,LOGFAC*535,LOGFAC*532,LOGFAC*528,LOGFAC*524,LOGFAC*520,LOGFAC*516,LOGFAC*513, LOGFAC*508,LOGFAC*505,LOGFAC*502,LOGFAC*498,LOGFAC*494,LOGFAC*491,LOGFAC*487,LOGFAC*484, LOGFAC*480,LOGFAC*477,LOGFAC*474,LOGFAC*470,LOGFAC*467,LOGFAC*463,LOGFAC*460,LOGFAC*457, LOGFAC*453,LOGFAC*450,LOGFAC*447,LOGFAC*443,LOGFAC*440,LOGFAC*437,LOGFAC*434,LOGFAC*431 }; volatile int noteperiod[] = { 6848, 6464, 6096, 5760, 5424, 5120, 4832, 4560, 4304, 4064, 3840, 3628 }; // for vibrato and tremolo static volatile int vib_table[] = { 0, 24, 49, 74, 97, 120, 141, 161, 180, 197, 212, 224, 235, 244, 250, 253, 255, 253, 250, 244, 235, 224, 212, 197, 180, 161, 141, 120, 97, 74, 49, 24}; volatile int voice_table[MAX_ALLEG_VOICE] = { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 }; int interpolate(int p, int p1, int p2, int v1, int v2) { int dp, dv, di; if(p1 == p2) return v1; dv = v2 - v1; dp = p2 - p1; di = p - p1; return v1 + ((di*dv) / dp); }END_OF_FUNCTION (interpolate) int find_lower_period(int period, int times) { int result = period; int index = 0; if (mi.flag & XM_MODE) { while (result >= period) { index++; if ( note2period (index, 0) <= period ) { index += times; result = note2period (index, 0); } } } else { while (result >= period) { if ( (noteperiod[index%12] >> (index/12)) <= period) { index += times; result = noteperiod[index%12] >> (index/12); } index++; } } return result; }END_OF_FUNCTION (find_lower_period) // change the volume from scale of 64 to 255 int calc_volume (int chn) { int temp; temp = ci[chn].temp_volume * mi.global_volume * ci[chn].volfade; // 0...2^27 temp >>= 19; // 0...256 temp *= mod_volume * ci[chn].volenv.v; // 0...4177920 temp >>= 14; // 0...255 return temp; }END_OF_FUNCTION (calc_volume) int calc_pan (int chn) { int temp; temp = ci[chn].temp_pan + ((ci[chn].panenv.v - 32) * (128 - ABS(ci[chn].temp_pan - 128)) / 32); if (temp > 255) temp = 255; else if (temp < 0) temp = 0; return temp; }END_OF_FUNCTION (calc_pan) // return the position of the note NOTE_INFO *get_note (JGMOD *j, int pat, int pos, int chn) { PATTERN_INFO *pi; NOTE_INFO *ni; pi = j->pi + pat; ni = pi->ni + (pos*j->no_chn + chn); return ni; }END_OF_FUNCTION (get_note) int note2period (int note, int c2spd) { if (mi.flag & LINEAR_MODE) { if (note < 0) note = 0; else if (note > 118) note = 118; return (7680 - (note*64) - (c2spd/2) + 64); } else if (mi.flag & PERIOD_MODE) { uchar n, o; ushort p1, p2, i; if (note < 0) note = 0; else if (note>118) note = 118; n = note % 12; o = note / 12; i = (n<<3) + (c2spd>> 4); p1 = logtab[i]; p2 = logtab[i+1]; return (interpolate (c2spd/16, 0, 15, p1, p2) >> o); } else { int temp; if (c2spd == 0) c2spd = 4242; temp = note * c2spd / 8363; return (NTSC << 2) / temp; } }END_OF_FUNCTION (note2period) int get_jgmod_sample_no (int instrument_no, int note_no) { INSTRUMENT_INFO *ii; if (mi.flag & XM_MODE) { if (note_no > 95 || note_no < 0) return (of->no_sample - 1); if (instrument_no >= of->no_instrument || instrument_no < 0) return (of->no_sample - 1); ii = of->ii + instrument_no; if (ii->sample_number[note_no] >= of->no_sample) return (of->no_sample - 1); else if (ii->sample_number[note_no] < 0) return (of->no_sample - 1); else return ii->sample_number[note_no]; } else return instrument_no; }END_OF_FUNCTION (get_jgmod_sample_no) int period2pitch (int period) { if ( (of->flag & XM_MODE) && (of->flag & LINEAR_MODE) ) { int temp; //char buf[108]; //asm ("fnsave %0" : "=m" (buf) : ); // save fpu registers //temp = floor(8363.0 * pow ( 2, (4608 - period) / 768.0 )); //asm ("frstor %0" : : "m" (buf)); // restore fpu registers temp = lintab[period % 768] >> (period / 768); //temp >>= 2; return temp; } else if ( (of->flag & XM_MODE) && (of->flag & PERIOD_MODE) ) return 14317456L / period; else return ((NTSC << 2) / period); }END_OF_FUNCTION (period2pitch) void do_position_jump (int extcommand) { if (enable_lasttrk_loop == TRUE) { mi.new_trk = extcommand + 1; if (mi.loop == TRUE) if (mi.new_trk > of->no_trk) mi.new_trk = 1; if (!mi.new_pos) mi.new_pos = 1; } else { if (mi.trk < (of->no_trk-1)) { mi.new_trk = extcommand + 1; if (!mi.new_pos) mi.new_pos = 1; } } }END_OF_FUNCTION (do_position_jump) void do_pattern_break (int extcommand) { PATTERN_INFO *pi; if (!mi.new_trk) mi.new_trk = mi.trk+2; mi.new_pos = (extcommand >> 4) * 10 + (extcommand & 0xF) + 1; if (mi.loop == TRUE) if (mi.new_trk > of->no_trk) mi.new_trk = 1; pi = of->pi + *(of->pat_table + mi.new_trk-1); if ( (mi.new_pos-1) >= pi->no_pos) mi.new_pos -= 1; }END_OF_FUNCTION (do_pattern_break) void do_pro_tempo_bpm (int extcommand) { if (extcommand == 0) {} else if (extcommand <= 32) mi.tempo = extcommand; else { mi.bpm = extcommand; //remove_int (mod_interrupt); install_int_ex (mod_interrupt, BPM_TO_TIMER (mi.bpm * 24 * speed_ratio)); } }END_OF_FUNCTION (do_pro_tempo_bpm) void do_pattern_loop (int chn, int extcommand) { if ( (extcommand & 0xF) == 0) ci[chn].loop_start = mi.pos; else { if (ci[chn].loop_times > 0) ci[chn].loop_times--; else ci[chn].loop_times = extcommand & 0xF; if (ci[chn].loop_times > 0) ci[chn].loop_on = TRUE; else ci[chn].loop_start = mi.pos+1; } }END_OF_FUNCTION (do_pattern_loop) void parse_pro_pitch_slide_up (int chn, int extcommand) { ci[chn].pro_pitch_slide_on = TRUE; if (extcommand) ci[chn].pro_pitch_slide = (extcommand << 2); ci[chn].pro_pitch_slide = -ABS(ci[chn].pro_pitch_slide); }END_OF_FUNCTION (parse_pro_pitch_slide_up) void parse_pro_pitch_slide_down (int chn, int extcommand) { ci[chn].pro_pitch_slide_on = TRUE; if (extcommand) ci[chn].pro_pitch_slide = (extcommand << 2); ci[chn].pro_pitch_slide = ABS(ci[chn].pro_pitch_slide); }END_OF_FUNCTION (parse_pro_pitch_slide_down) void parse_pro_volume_slide (int chn, int extcommand) { if (extcommand & 0xF0) ci[chn].pro_volume_slide = ((extcommand & 0xF0) >> 4); else if (extcommand & 0xF) ci[chn].pro_volume_slide = -(extcommand & 0xF); }END_OF_FUNCTION(parse_pro_volume_slide) void parse_vibrato (int chn, int extcommand, int shift) { if (!ci[chn].period) return; ci[chn].vibrato_on = TRUE; ci[chn].vibrato_shift = shift; if (extcommand >> 4) ci[chn].vibrato_speed = (extcommand & 0xF0) >> 2; if (extcommand & 0xF) ci[chn].vibrato_depth = (extcommand & 0xF); }END_OF_FUNCTION (parse_vibrato) void do_vibrato (int chn) { int temp=0; int q; q = (ci[chn].vibrato_pointer >> 2) & 0x1F; if ( (ci[chn].vibrato_waveform & 3) == 0 ) temp = vib_table[q]; else if ( (ci[chn].vibrato_waveform & 3) == 1) { q <<= 3; if (ci[chn].vibrato_pointer < 0) q = 255 - q; temp = q; } else if ( (ci[chn].vibrato_waveform & 3) == 2) temp = 255; else temp = rand() % 255; temp *= ci[chn].vibrato_depth; temp >>= ci[chn].vibrato_shift; if (ci[chn].vibrato_pointer >= 0) temp += ci[chn].period; else temp = ci[chn].period - temp; ci[chn].temp_period = temp; if (mi.tick) ci[chn].vibrato_pointer += ci[chn].vibrato_speed; }END_OF_FUNCTION (do_vibrato) void parse_tremolo (int chn, int extcommand, int shift) { ci[chn].tremolo_on = TRUE; ci[chn].tremolo_shift = shift; if (extcommand & 0xF0) ci[chn].tremolo_speed = (extcommand & 0xF0) >> 2; if (extcommand & 0xF) ci[chn].tremolo_depth = (extcommand & 0xF); }END_OF_FUNCTION (parse_tremolo) void do_tremolo (int chn) { int q; int temp; q = (ci[chn].tremolo_pointer >> 2) & 0x1F; if ( (ci[chn].tremolo_waveform & 3) == 0) temp = vib_table[q]; else if ( (ci[chn].tremolo_waveform & 3) == 1) { q <<= 3; if (ci[chn].tremolo_pointer < 0) q = 255 -q; temp = q; } else if ( (ci[chn].tremolo_waveform & 3) == 2) temp = 255; else temp = rand() % 255; temp *= ci[chn].tremolo_depth; temp >>= ci[chn].tremolo_shift; if (ci[chn].tremolo_pointer >= 0) ci[chn].temp_volume = ci[chn].volume + temp; else ci[chn].temp_volume = ci[chn].volume - temp; if (mi.tick) ci[chn].tremolo_pointer += ci[chn].tremolo_speed; }END_OF_FUNCTION (do_tremolo) void parse_slide2period (int chn, int extcommand, int note) { if (!ci[chn].period) return; if (extcommand > 0) ci[chn].slide2period_spd = (extcommand << 2); if (note > 0) ci[chn].slide2period = note2period (note-1, ci[chn].c2spd); ci[chn].slide2period_spd = ABS (ci[chn].slide2period_spd); if (ci[chn].slide2period > ci[chn].period) ci[chn].slide2period_spd = -ABS (ci[chn].slide2period_spd); if (!ci[chn].slide2period) return; ci[chn].slide2period_on = TRUE; }END_OF_FUNCTION(parse_slide2period) void do_slide2period (int chn) { ci[chn].period -= ci[chn].slide2period_spd; if (ci[chn].slide2period_spd > 0) // sliding down { if (ci[chn].period < ci[chn].slide2period) ci[chn].period = ci[chn].slide2period; } else { if (ci[chn].period > ci[chn].slide2period) ci[chn].period = ci[chn].slide2period; } ci[chn].temp_period = ci[chn].period; }END_OF_FUNCTION(do_slide2period) void parse_pro_arpeggio (int chn, int extcommand) { if (!ci[chn].period) return; if (extcommand) { ci[chn].arpeggio = extcommand; ci[chn].arpeggio_on = TRUE; } }END_OF_FUNCTION(parse_pro_arpeggio) void do_arpeggio (int chn) { if ( (mi.tick % 3) == 0) ci[chn].temp_period = ci[chn].period; else if ( (mi.tick % 3) == 1) ci[chn].temp_period = find_lower_period (ci[chn].period, (ci[chn].arpeggio & 0xF0) >> 4); else if ( (mi.tick % 3) == 2) ci[chn].temp_period = find_lower_period (ci[chn].period, ci[chn].arpeggio & 0xF); }END_OF_FUNCTION(do_arpeggio) void do_delay_sample (int chn) { if (mi.tick == ci[chn].delay_sample) { ci[chn].kick = TRUE; ci[chn].delay_sample = 0; } else ci[chn].kick = FALSE; }END_OF_FUNCTION(do_delay_sample) void parse_old_note (int chn, int note, int sample_no) { SAMPLE_INFO *si; if (note > 0 && sample_no >= 0) { si = of->si+sample_no; ci[chn].sample = sample_no; ci[chn].volume = si->volume; ci[chn].c2spd = si->c2spd; ci[chn].period = note2period (note, ci[chn].c2spd); ci[chn].kick = TRUE; } else if ( (note > 0) && (sample_no < 0) ) // only pitch specified { si = of->si + ci[chn].sample; ci[chn].period = note2period (note, ci[chn].c2spd); ci[chn].kick = TRUE; } else if ( (note <= 0) && (sample_no >= 0) ) // only sample_spedified { if ( (ci[chn].sample != sample_no) && (ci[chn].period > 0)) ci[chn].kick = TRUE; si = of->si + sample_no; ci[chn].sample = sample_no; ci[chn].volume = si->volume; ci[chn].c2spd = si->c2spd; } }END_OF_FUNCTION(parse_old_note) void parse_extended_command (int chn, int extcommand) { switch (extcommand >> 4) { case 1 : // fine pitch slide up { if (!ci[chn].period) break; if (extcommand & 0xF) ci[chn].pro_fine_pitch_slide = ((extcommand & 0xF) << 2); else if ( ((extcommand & 0xF) == 0) && (ci[chn].pro_fine_pitch_slide > 0)) break; ci[chn].pro_fine_pitch_slide = -ABS(ci[chn].pro_fine_pitch_slide); ci[chn].period += ci[chn].pro_fine_pitch_slide; break; } case 2 : // fine pitch slide down { if (!ci[chn].period) break; if (extcommand & 0xF) ci[chn].pro_fine_pitch_slide = ((extcommand & 0xF) << 2); else if ( ((extcommand & 0xF) == 0) && (ci[chn].pro_fine_pitch_slide < 0)) break; ci[chn].pro_fine_pitch_slide = ABS(ci[chn].pro_fine_pitch_slide); ci[chn].period += ci[chn].pro_fine_pitch_slide; break; } case 3: // glissando { if (extcommand & 0xF) ci[chn].glissando = TRUE; else ci[chn].glissando = FALSE; break; } case 4 : // set vibrato waveform { ci[chn].vibrato_waveform = (extcommand & 0xF); break; } case 7 : // set tremolo waveform { ci[chn].tremolo_waveform = (extcommand & 0xF); break; } case 8 : // set 16 position panning { ci[chn].pan = (extcommand & 0xF) * 17; break; } case 9 : // retrigger sample { ci[chn].retrig = (extcommand & 0xF); break; } case 10 : // fine volume slide up { ci[chn].volume += (extcommand & 0xF); break; } case 11 : // fine volume slide down { ci[chn].volume -= (extcommand & 0xF); break; } case 12 : // cut sample { ci[chn].cut_sample = (extcommand & 0xF); if (ci[chn].cut_sample == 0) ci[chn].volume = 0; break; } case 13 : // delay sample { ci[chn].delay_sample = (extcommand & 0xF); break; } case 16 : // stereo control { ci[chn].pan = (extcommand & 0xF); if (ci[chn].pan < 8) ci[chn].pan += 8; else ci[chn].pan -= 8; ci[chn].pan *= 17; break; } case 17 : // xm fine porta down { if (!ci[chn].period) break; if (extcommand & 0xF) ci[chn].xm_fine_pitch_slide_down = -((extcommand & 0xF) << 2); ci[chn].period += ci[chn].xm_fine_pitch_slide_down; break; } case 18 : // xm fine porta up { if (!ci[chn].period) break; if (extcommand & 0xF) ci[chn].xm_fine_pitch_slide_up = ((extcommand & 0xF) << 2); ci[chn].period += ci[chn].xm_fine_pitch_slide_up; break; } case 19 : // xm fine volume slide up { if (extcommand & 0xF) ci[chn].xm_fine_volume_slide_up = (extcommand & 0xF); ci[chn].temp_volume += ci[chn].xm_fine_volume_slide_up; ci[chn].volume += ci[chn].xm_fine_volume_slide_up; break; } case 20 : // xm fine volume slide down { if (extcommand & 0xF) ci[chn].xm_fine_volume_slide_down = -(extcommand & 0xF); ci[chn].temp_volume += ci[chn].xm_fine_volume_slide_down; ci[chn].volume += ci[chn].xm_fine_volume_slide_down; break; } } } void lock_jgmod_player2(void) { LOCK_FUNCTION(interpolate); LOCK_FUNCTION(find_lower_period); LOCK_FUNCTION(get_note); LOCK_FUNCTION(calc_volume); LOCK_FUNCTION(calc_pan); LOCK_FUNCTION(note2period); LOCK_FUNCTION(get_jgmod_sample_no); LOCK_FUNCTION(period2pitch); LOCK_FUNCTION(do_position_jump); LOCK_FUNCTION(do_pattern_break); LOCK_FUNCTION(do_pro_tempo_bpm); LOCK_FUNCTION(do_pattern_loop); LOCK_FUNCTION(do_vibrato); LOCK_FUNCTION(do_tremolo); LOCK_FUNCTION(do_slide2period); LOCK_FUNCTION(do_arpeggio); LOCK_FUNCTION(do_delay_sample); LOCK_FUNCTION(parse_pro_pitch_slide_up); LOCK_FUNCTION(parse_pro_pitch_slide_down); LOCK_FUNCTION(parse_pro_volume_slide); LOCK_FUNCTION(parse_slide2period); LOCK_FUNCTION(parse_vibrato); LOCK_FUNCTION(parse_tremolo); LOCK_FUNCTION(parse_pro_arpeggio); LOCK_FUNCTION(parse_old_note); #ifdef __ALLEGRO_DJGPP__ _go32_dpmi_lock_data((void *)noteperiod, sizeof(noteperiod[0]) * 12); _go32_dpmi_lock_data((void *)vib_table, sizeof(vib_table[0]) * 24); _go32_dpmi_lock_data((void *)voice_table, sizeof(voice_table[0]) * MAX_ALLEG_VOICE); _go32_dpmi_lock_data((void *)logtab, sizeof(logtab[0]) * 104); _go32_dpmi_lock_data((void *)mod_finetune, sizeof(mod_finetune[0]) * 16); _go32_dpmi_lock_data((void *)lintab, sizeof(lintab[0]) * 768); #endif } --- NEW FILE: player4.c --- /* * * _______ _______ __________ _______ _____ * /____ / / _____/ / / / ___ / / ___ \ * __ / / / / ____ / // // / / / / / / / / / * / /_/ / / /__/ / / / /_/ / / / /__/ / / /__/ / * /______/ /______/ /_/ /_/ /______/ /______/ * * * * Guan Foo Wah * 18, SS 17 / 1H * 47500 Subang Jaya * Selangor * Malaysia * * * New effects for XM are located here. */ #include <allegro.h> #include "jgmod.h" #include "jshare.h" void parse_new_note (int chn, int note, int sample_no) { SAMPLE_INFO *si; INSTRUMENT_INFO *ii = null; ci[chn].keyon = FALSE; ci[chn].volfade = 32768; ci[chn].instfade = 0; ci[chn].volenv.flg = 0; ci[chn].volenv.pts = 0; ci[chn].volenv.a = 0; ci[chn].volenv.b = 0; ci[chn].volenv.p = 0; ci[chn].volenv.v = 64; ci[chn].panenv.flg = 0; ci[chn].panenv.pts = 0; ci[chn].panenv.a = 0; ci[chn].panenv.b = 0; ci[chn].panenv.p = 0; ci[chn].panenv.v = 32; note--; if (note >= 0 && sample_no >= 0) // pitch and note specified { ci[chn].note = note; ci[chn].instrument = sample_no; ci[chn].sample = get_jgmod_sample_no (sample_no, ci[chn].note); si = of->si+ci[chn].sample; ci[chn].volume = si->volume; ci[chn].transpose = si->transpose; ci[chn].c2spd = si->c2spd; ci[chn].period = note2period (ci[chn].note+ci[chn].transpose, ci[chn].c2spd); ci[chn].kick = TRUE; ci[chn].pan = si->pan; } else if ( (note >= 0) && (sample_no < 0) ) // only note specified { ci[chn].note = note; ci[chn].sample = get_jgmod_sample_no (ci[chn].instrument, note); si = of->si + ci[chn].sample; ci[chn].transpose = si->transpose; ci[chn].c2spd = si->c2spd; ci[chn].period = note2period (ci[chn].note+ci[chn].transpose, ci[chn].c2spd); ci[chn].kick = TRUE; } /* else if ( (note < 0) && (sample_no >= 0) ) // only sample_spedified { if ( (ci[chn].instrument != sample_no) && (ci[chn].period > 0)) ci[chn].kick = TRUE; ci[chn].instrument = sample_no; ci[chn].sample = get_jgmod_sample_no (sample_no, ci[chn].note); si = of->si + ci[chn].sample; ci[chn].transpose = si->transpose; ci[chn].volume = si->volume; ci[chn].c2spd = si->c2spd; ci[chn].pan = si->pan; } */ // make sure it doesn't access invalid instruments with could happen if ( (ci[chn].instrument < of->no_instrument) && (ci[chn].instrument >= 0) ) { ii = of->ii+ci[chn].instrument; ci[chn].instfade = ii->volume_fadeout; // initialize the volume envelope start_envelope (&ci[chn].volenv, ii->volenv, ii->volpos, ii->vol_type, ii->no_volenv, ii->vol_begin, ii->vol_end, ii->vol_susbeg, ii->vol_susend); // initialize the pan envelope start_envelope (&ci[chn].panenv, ii->panenv, ii->panpos, ii->pan_type, ii->no_panenv, ii->pan_begin, ii->pan_end, ii->pan_susbeg, ii->pan_susend); } }END_OF_FUNCTION (parse_new_note) void parse_xm_volume_slide (int chn, int extcommand) { ci[chn].xm_volume_slide_on = TRUE; if (extcommand) { if (extcommand & 0xF0) ci[chn].xm_volume_slide = ((extcommand & 0xF0) >> 4); else ci[chn].xm_volume_slide = -(extcommand & 0xF); } }END_OF_FUNCTION (parse_xm_volume_slide) void do_xm_volume_slide (int chn) { ci[chn].volume += ci[chn].xm_volume_slide; ci[chn].temp_volume += ci[chn].xm_volume_slide; }END_OF_FUNCTION (do_xm_volume_slide) void parse_xm_pitch_slide_up (int chn, int extcommand) { if (!ci[chn].period) return; ci[chn].xm_pitch_slide_up_on = TRUE; if (extcommand) ci[chn].xm_pitch_slide_up = -(extcommand << 2); }END_OF_FUNCTION (parse_xm_pitch_slide_up) void parse_xm_pitch_slide_down (int chn, int extcommand) { if (!ci[chn].period) return; ci[chn].xm_pitch_slide_down_on = TRUE; if (extcommand) ci[chn].xm_pitch_slide_down = (extcommand << 2); }END_OF_FUNCTION (parse_xm_pitch_slide_down) void do_xm_pitch_slide_down (int chn) { ci[chn].period += ci[chn].xm_pitch_slide_down; ci[chn].temp_period += ci[chn].xm_pitch_slide_down; }END_OF_FUNCTION (do_xm_pitch_slide_down) void do_xm_pitch_slide_up (int chn) { ci[chn].period += ci[chn].xm_pitch_slide_up; ci[chn].temp_period += ci[chn].xm_pitch_slide_up; if (ci[chn].period < 40) ci[chn].period = 40; if (ci[chn].temp_period < 40) ci[chn].temp_period = 40; }END_OF_FUNCTION (do_xm_pitch_slide_up) void do_xm_pan_slide (int chn) { ci[chn].pan += ci[chn].pan_slide_common; ci[chn].temp_pan += ci[chn].pan_slide_common; }END_OF_FUNCTION (do_xm_pan_slide) void parse_xm_pan_slide (int chn, int extcommand) { if (extcommand) { if (extcommand & 0xF0) ci[chn].pan_slide = (extcommand & 0xF0) >> 4; else if (extcommand & 0xF) ci[chn].pan_slide = -(extcommand & 0xF); } ci[chn].pan_slide_common = ci[chn].pan_slide; }END_OF_FUNCTION (parse_xm_pan_slide) void parse_global_volume_slide (int chn, int extcommand) { ci[chn].global_volume_slide_on = TRUE; if (extcommand) { if (extcommand & 0xF0) ci[chn].global_volume_slide = ((extcommand & 0xF0) >> 4); else if (extcommand & 0xF) ci[chn].global_volume_slide = -(extcommand & 0xF); } }END_OF_FUNCTION (parse_global_volume_slide) void do_global_volume_slide (int chn) { mi.global_volume += ci[chn].global_volume_slide; if (mi.global_volume > 64) mi.global_volume = 64; else if (mi.global_volume < 0) mi.global_volume = 0; }END_OF_FUNCTION (do_global_volume_slide) void do_xm_x (int chn, int extcommand) { if (!ci[chn].period) return; if ( ((extcommand & 0xF0) >> 4) == 1) // extra fine porta up { if (extcommand & 0xF) ci[chn].xm_x_up = -(extcommand & 0xF); ci[chn].period += ci[chn].xm_x_up; } else if ( ((extcommand & 0xF0) >> 4) == 2) // extra fine porta up { if (extcommand & 0xF) ci[chn].xm_x_down = (extcommand & 0xF); ci[chn].period += ci[chn].xm_x_down; } }END_OF_FUNCTION (do_xm_x) void start_envelope (volatile ENVELOPE_INFO *t, int *env, int *pos, int flg, int pts, int loopbeg, int loopend, int susbeg, int susend) { int temp; for (temp = 0; temp < 12; temp++) { t->env[temp] = env[temp]; t->pos[temp] = pos[temp]; } t->flg = flg; t->pts = pts; t->loopbeg = loopbeg; t->loopend = loopend; t->susbeg = susbeg; t->susend = susend; t->a = 0; t->b = 1; t->p = 0; if ( (t->flg & ENV_SUS) && (t->susbeg == 0) ) t->b = 0; if ( (t->flg & ENV_ON) && (t->pts == 1) ) t->b = 0; }END_OF_FUNCTION (start_envelope); void process_envelope (volatile ENVELOPE_INFO *t, int v, int keyon) { t->v = v; if ( (t->flg == 0) || (t->pts == 0) ) return; if ( (t->flg & ENV_ON) && t->pts) { int a, b, p; a = t->a; b = t->b; p = t->p; if (a == b) t->v = t->env[a]; else t->v = interpolate(p, t->pos[a], t->pos[b], t->env[a], t->env[b]); p++; // pointer reached point b if (p >= t->pos[b]) { a = b; b++; if ( (t->flg & ENV_SUS) && (keyon == FALSE) && (b > t->susend) ) { a = t->susbeg; p = t->pos[a]; if (t->susbeg == t->susend) b = a; else b = a + 1; } else if ( (t->flg & ENV_LOOP) && (b > t->loopend) ) { a = t->loopbeg; p = t->pos[a]; if (t->loopbeg == t->loopend) b = a; else b = a + 1; } else if (b >= t->pts) { b--; p--; } } t->p = p; t->a = a; t->b = b; } }END_OF_FUNCTION (process_envelope); void parse_xm_set_envelop_position (volatile ENVELOPE_INFO *t, int extcommand) { int no_points; if (t->pts > 0) { no_points = t->pos[t->pts-1]; t->p = (extcommand > no_points) ? no_points : extcommand; t->b = 0; while (t->p >= t->pos[t->b] ) (t->b)++; t->a = t->b - 1; if (t->a < 0) t->a = 0; } }END_OF_FUNCTION (parse_xm_set_envelop_position); void lock_jgmod_player4 (void) { LOCK_FUNCTION (parse_new_note); LOCK_FUNCTION (parse_xm_volume_slide); LOCK_FUNCTION (parse_xm_pitch_slide_up); LOCK_FUNCTION (parse_xm_pitch_slide_down); LOCK_FUNCTION (parse_xm_pan_slide); LOCK_FUNCTION (parse_global_volume_slide); LOCK_FUNCTION (parse_xm_set_envelop_position); LOCK_FUNCTION (do_xm_volume_slide); LOCK_FUNCTION (do_xm_pitch_slide_up); LOCK_FUNCTION (do_xm_pitch_slide_down); LOCK_FUNCTION (do_xm_pan_slide); LOCK_FUNCTION (do_global_volume_slide); LOCK_FUNCTION (do_xm_x); LOCK_FUNCTION (start_envelope); LOCK_FUNCTION (process_envelope); } --- NEW FILE: player3.c --- /* * * _______ _______ __________ _______ _____ * /____ / / _____/ / / / ___ / / ___ \ * __ / / / / ____ / // // / / / / / / / / / * / /_/ / / /__/ / / / /_/ / / / /__/ / / /__/ / * /______/ /______/ /_/ /_/ /______/ /______/ * * * * Guan Foo Wah * 18, SS 17 / 1H * 47500 Subang Jaya * Selangor * Malaysia * * * New effects for s3m are located here. */ #include <allegro.h> #include "jgmod.h" #include "jshare.h" #define speed_ratio mi.speed_ratio / 100 #define pitch_ratio mi.pitch_ratio / 100 void do_s3m_set_tempo (int extcommand) { if (extcommand > 0) mi.tempo = extcommand; }END_OF_FUNCTION (do_s3m_set_tempo) void do_s3m_set_bpm (int extcommand) { if (extcommand >= 32) mi.bpm = extcommand; else if (extcommand <= 15) mi.bpm += extcommand; else if ( (extcommand > 15) && (extcommand < 32) ) mi.bpm -= extcommand - 16; //remove_int (mod_interrupt); install_int_ex (mod_interrupt, BPM_TO_TIMER (mi.bpm * 24 * speed_ratio)); }END_OF_FUNCTION (do_s3m_set_bpm) void parse_s3m_volume_slide (int chn, int extcommand) { // fine volume slide down if ( (extcommand & 0xF0) == 0xF0 && (extcommand & 0xF) != 0) { ci[chn].s3m_fine_volume_slide = -(extcommand & 0xF); ci[chn].s3m_volume_slide = 0; ci[chn].s3m_volume_slide_on = TRUE; } // fine volume slide up else if ( (extcommand & 0xF) == 0xF && (extcommand & 0xF0) != 0) { ci[chn].s3m_fine_volume_slide = ((extcommand & 0xF0) >> 4); ci[chn].s3m_volume_slide = 0; ci[chn].s3m_volume_slide_on = TRUE; } // volume slide up else if ( (extcommand & 0xF) == 0 && (extcommand & 0xF0) != 0) { ci[chn].s3m_volume_slide = extcommand >> 4; ci[chn].s3m_fine_volume_slide = 0; ci[chn].s3m_volume_slide_on = TRUE; } // volume slide down else if ( (extcommand & 0xF0) == 0 && (extcommand & 0xF) != 0) { ci[chn].s3m_volume_slide = -(extcommand & 0xF); ci[chn].s3m_fine_volume_slide = 0; ci[chn].s3m_volume_slide_on = TRUE; } else if (extcommand == 0) // continue volume slide ci[chn].s3m_volume_slide_on = TRUE; }END_OF_FUNCTION (parse_s3m_volume_slide); void do_s3m_volume_slide (int chn) { if (mi.tick == 0) //finetunes { ci[chn].volume += ci[chn].s3m_fine_volume_slide; ci[chn].temp_volume += ci[chn].s3m_fine_volume_slide; } else // volume slide { ci[chn].volume += ci[chn].s3m_volume_slide; ci[chn].temp_volume += ci[chn].s3m_volume_slide; } }END_OF_FUNCTION (do_s3m_volume_slide); void parse_s3m_portamento_up (int chn, int extcommand) { if (!ci[chn].period) return; if ( (extcommand > 0) && (extcommand <= 0xDF) ) { ci[chn].s3m_fine_pitch_slide = 0; ci[chn].s3m_pitch_slide = -extcommand * 4; } else if ( (extcommand >= 0xE0) && (extcommand <= 0xEF) ) { ci[chn].s3m_fine_pitch_slide = -(extcommand & 0xF); ci[chn].s3m_pitch_slide = 0; } else if ( (extcommand >= 0xF0) && (extcommand <= 0xFF) ) { ci[chn].s3m_fine_pitch_slide = -((extcommand & 0xF) << 2); ci[chn].s3m_pitch_slide = 0; } else if (extcommand == 0) { ci[chn].s3m_pitch_slide = -ABS(ci[chn].s3m_pitch_slide); ci[chn].s3m_fine_pitch_slide = -ABS(ci[chn].s3m_fine_pitch_slide); } ci[chn].s3m_pitch_slide_on = TRUE; }END_OF_FUNCTION (parse_s3m_portamento_up) void parse_s3m_portamento_down (int chn, int extcommand) { if (!ci[chn].period) return; if ( (extcommand > 0) && (extcommand <= 0xDF) ) { ci[chn].s3m_fine_pitch_slide = 0; ci[chn].s3m_pitch_slide = extcommand * 4; } else if ( (extcommand >= 0xE0) && (extcommand <= 0xEF)) { ci[chn].s3m_pitch_slide = 0; ci[chn].s3m_fine_pitch_slide = extcommand & 0xF; } else if ( (extcommand >= 0xF0) && (extcommand <= 0xFF)) { ci[chn].s3m_pitch_slide = 0; ci[chn].s3m_fine_pitch_slide = ((extcommand & 0xF) << 2); } else if (extcommand == 0) { ci[chn].s3m_pitch_slide = ABS(ci[chn].s3m_pitch_slide); ci[chn].s3m_fine_pitch_slide = ABS(ci[chn].s3m_fine_pitch_slide); } ci[chn].s3m_pitch_slide_on = TRUE; }END_OF_FUNCTION (parse_s3m_portamento_down) void do_s3m_portamento (int chn) { if (mi.tick == 0) { ci[chn].period += ci[chn].s3m_fine_pitch_slide; ci[chn].temp_period += ci[chn].s3m_fine_pitch_slide; } else { ci[chn].period += ci[chn].s3m_pitch_slide; ... [truncated message content] |
|
From: Yura S. <yu...@us...> - 2006-06-18 13:10:08
|
Update of /cvsroot/timewarp/source/twgui In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv6689/source/twgui Modified Files: utils.h utils.cpp twpopup.cpp twhelpers.cpp Log Message: Fixed linux compilation issues. Code is compiling on amd64 now. Index: utils.h =================================================================== RCS file: /cvsroot/timewarp/source/twgui/utils.h,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** utils.h 11 Jul 2005 00:25:59 -0000 1.12 --- utils.h 18 Jun 2006 13:10:02 -0000 1.13 *************** *** 164,168 **** --- 164,170 ---- }; + #ifdef WIN32 int round(double x); + #endif Index: utils.cpp =================================================================== RCS file: /cvsroot/timewarp/source/twgui/utils.cpp,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** utils.cpp 11 Jul 2005 00:25:59 -0000 1.14 --- utils.cpp 18 Jun 2006 13:10:02 -0000 1.15 *************** *** 47,51 **** ! int round(double x) { --- 47,51 ---- ! #ifdef WIN32 int round(double x) { *************** *** 55,59 **** return int(x - 0.5); } ! --- 55,59 ---- return int(x - 0.5); } ! #endif Index: twpopup.cpp =================================================================== RCS file: /cvsroot/timewarp/source/twgui/twpopup.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** twpopup.cpp 11 Jul 2005 00:25:59 -0000 1.8 --- twpopup.cpp 18 Jun 2006 13:10:02 -0000 1.9 *************** *** 8,12 **** #include <stdio.h> #include <string.h> ! --- 8,12 ---- #include <stdio.h> #include <string.h> ! #include <math.h> Index: twhelpers.cpp =================================================================== RCS file: /cvsroot/timewarp/source/twgui/twhelpers.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** twhelpers.cpp 11 Jul 2005 00:25:59 -0000 1.8 --- twhelpers.cpp 18 Jun 2006 13:10:02 -0000 1.9 *************** *** 8,12 **** #include <stdio.h> #include <string.h> ! --- 8,12 ---- #include <stdio.h> #include <string.h> ! #include <math.h> |
|
From: Yura S. <yu...@us...> - 2006-06-18 13:10:07
|
Update of /cvsroot/timewarp/source/alfont In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv6689/source/alfont Added Files: alfontdll.h alfont.h Log Message: Fixed linux compilation issues. Code is compiling on amd64 now. --- 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: 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 |
Update of /cvsroot/timewarp/ships In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv5954/ships Modified Files: shpoliha.ini Removed Files: shparitr.dat shparitr.ini shparitr.txt shpastba.dat shpastba.ini shpastba.txt shpbubex.dat shpbubex.ini shpdeees.dat shpdeees.ini shpdjila.dat shpdjila.ini shpilwsp.dat shpilwsp.ini shpilwsp.txt shpimpka.dat shpimpka.ini shpimpka.txt shpjurcu.dat shpjurcu.ini shpktesa.dat shpktesa.ini shpktesa.txt shpmekpi.dat shpmekpi.ini shpmekpi.txt shpnisha.dat shpnisha.ini shpnisha.txt shpqlore.dat shpqlore.ini shpquawr.dat shpquawr.ini shpquawr.txt shptaume.dat shptaume.ini shptaume.txt shptausl.dat shptausl.ini shpterbi.dat shpterbi.ini shpterbi.txt shpvuvji.dat shpvuvji.ini shpwassu.dat shpwassu.ini Log Message: --- shpnisha.txt DELETED --- --- shpastba.txt DELETED --- --- shpimpka.ini DELETED --- --- shpktesa.txt DELETED --- --- shpquawr.txt DELETED --- --- shpterbi.ini DELETED --- --- shpquawr.dat DELETED --- --- shpterbi.dat DELETED --- --- shpimpka.dat DELETED --- --- shptaume.dat DELETED --- --- shptaume.ini DELETED --- --- shpnisha.ini DELETED --- --- shpktesa.ini DELETED --- --- shpvuvji.ini DELETED --- --- shpbubex.dat DELETED --- --- shpilwsp.dat DELETED --- --- shptausl.ini DELETED --- --- shpmekpi.dat DELETED --- --- shparitr.ini DELETED --- --- shpjurcu.dat DELETED --- --- shpjurcu.ini DELETED --- --- shptausl.dat DELETED --- --- shpastba.ini DELETED --- --- shpktesa.dat DELETED --- --- shparitr.txt DELETED --- --- shpqlore.ini DELETED --- --- shparitr.dat DELETED --- Index: shpoliha.ini =================================================================== RCS file: /cvsroot/timewarp/ships/shpoliha.ini,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** shpoliha.ini 5 Jan 2004 21:59:54 -0000 1.4 --- shpoliha.ini 4 Jun 2006 13:12:16 -0000 1.5 *************** *** 8,13 **** [Ship] ! Crew = 7 ! CrewMax = 7 Batt = 6 BattMax = 6 --- 8,13 ---- [Ship] ! Crew = 16 ! CrewMax = 16 Batt = 6 BattMax = 6 *************** *** 35,42 **** [Special] RechargeRange = 6 ; mother ship must be in this range for recharging it ! CrewUse = 2 ; crewuse equals its armour Batt = 10 ; batt reserve to operate laser N = 5 ; max number of habitats ! Recrewtime = 5.0 ; period it takes before a new habitat member is created [Laser] --- 35,42 ---- [Special] RechargeRange = 6 ; mother ship must be in this range for recharging it ! CrewUse = 4 ; crewuse equals its armour Batt = 10 ; batt reserve to operate laser N = 5 ; max number of habitats ! Recrewtime = 4.0 ; period it takes before a new habitat member is created [Laser] --- shpimpka.txt DELETED --- --- shpilwsp.txt DELETED --- --- shpterbi.txt DELETED --- --- shpwassu.ini DELETED --- --- shpdeees.dat DELETED --- --- shptaume.txt DELETED --- --- shpdjila.dat DELETED --- --- shpmekpi.ini DELETED --- --- shpdjila.ini DELETED --- --- shpilwsp.ini DELETED --- --- shpdeees.ini DELETED --- --- shpvuvji.dat DELETED --- --- shpquawr.ini DELETED --- --- shpwassu.dat DELETED --- --- shpmekpi.txt DELETED --- --- shpbubex.ini DELETED --- --- shpastba.dat DELETED --- --- shpnisha.dat DELETED --- --- shpqlore.dat DELETED --- |
|
From: Rob <geo...@us...> - 2006-06-06 04:04:43
|
Update of /cvsroot/timewarp/ships In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv11581/ships Modified Files: shpaktgu.ini shpalhdr.ini shpbubbo.ini shpcrore.ini shpducla.ini shpdyzha.ini shpgahmo.ini shpkatpo.ini shpkorsi.ini shpleimu.ini shpoliha.ini shpraame.ini shptaufi.ini shptauto.ini shpuxjba.ini shpvezba.ini shpvioge.ini Log Message: Index: shpcrore.ini =================================================================== RCS file: /cvsroot/timewarp/ships/shpcrore.ini,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** shpcrore.ini 1 Mar 2004 22:21:09 -0000 1.1 --- shpcrore.ini 5 Jun 2006 11:59:44 -0000 1.2 *************** *** 3,7 **** Name1 = Crome Name2 = Revenant ! Origin = TW Coders = Tau Code = Crome --- 3,7 ---- Name1 = Crome Name2 = Revenant ! Origin = TWa Coders = Tau Code = Crome Index: shpoliha.ini =================================================================== RCS file: /cvsroot/timewarp/ships/shpoliha.ini,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** shpoliha.ini 4 Jun 2006 13:12:16 -0000 1.5 --- shpoliha.ini 5 Jun 2006 11:59:44 -0000 1.6 *************** *** 3,7 **** Name1 = Olidandee Name2 = Habitat ! Origin = TWb Coders = GeomanNL Code = Olidandee --- 3,7 ---- Name1 = Olidandee Name2 = Habitat ! Origin = TWa Coders = GeomanNL Code = Olidandee Index: shpaktgu.ini =================================================================== RCS file: /cvsroot/timewarp/ships/shpaktgu.ini,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** shpaktgu.ini 8 Jan 2004 22:21:42 -0000 1.1 --- shpaktgu.ini 5 Jun 2006 11:59:44 -0000 1.2 *************** *** 1,5 **** [Info] TWCost = 30 ! Origin = TWB Name = Aktun Gunner Name1 = Aktun --- 1,5 ---- [Info] TWCost = 30 ! Origin = TWa Name = Aktun Gunner Name1 = Aktun Index: shpdyzha.ini =================================================================== RCS file: /cvsroot/timewarp/ships/shpdyzha.ini,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** shpdyzha.ini 15 Jul 2005 16:23:26 -0000 1.9 --- shpdyzha.ini 5 Jun 2006 11:59:44 -0000 1.10 *************** *** 3,7 **** Name1 = Dyzun Name2 = Harbringer ! Origin = TWb Coders = Varith Code = DyzunHarbringer --- 3,7 ---- Name1 = Dyzun Name2 = Harbringer ! Origin = TWa Coders = Varith Code = DyzunHarbringer Index: shpleimu.ini =================================================================== RCS file: /cvsroot/timewarp/ships/shpleimu.ini,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** shpleimu.ini 15 Jul 2005 16:23:26 -0000 1.7 --- shpleimu.ini 5 Jun 2006 11:59:44 -0000 1.8 *************** *** 3,7 **** Name1 = Lei Name2 = Mule ! Origin = TWb Gfx = GeomanNL Sfx = none --- 3,7 ---- Name1 = Lei Name2 = Mule ! Origin = TWa Gfx = GeomanNL Sfx = none Index: shpgahmo.ini =================================================================== RCS file: /cvsroot/timewarp/ships/shpgahmo.ini,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** shpgahmo.ini 24 Jul 2005 00:27:50 -0000 1.5 --- shpgahmo.ini 5 Jun 2006 11:59:44 -0000 1.6 *************** *** 5,9 **** Name1 = Gahmur Name2 = Monitor ! Origin = TWb Coders = Varith Code = GahmurMonitor --- 5,9 ---- Name1 = Gahmur Name2 = Monitor ! Origin = TWa Coders = Varith Code = GahmurMonitor Index: shptaufi.ini =================================================================== RCS file: /cvsroot/timewarp/ships/shptaufi.ini,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** shptaufi.ini 8 Jan 2004 22:21:42 -0000 1.1 --- shptaufi.ini 5 Jun 2006 11:59:44 -0000 1.2 *************** *** 1,4 **** [Info] ! Origin = TWB TWCost = 26 Name1 = Tau --- 1,4 ---- [Info] ! Origin = TWa TWCost = 26 Name1 = Tau Index: shpuxjba.ini =================================================================== RCS file: /cvsroot/timewarp/ships/shpuxjba.ini,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** shpuxjba.ini 15 Jul 2005 19:12:13 -0000 1.7 --- shpuxjba.ini 5 Jun 2006 11:59:44 -0000 1.8 *************** *** 3,7 **** Name1 = Uxjoz Name2 = Battleplatform ! Origin = TWb Coders = GeomanNL Gfx = GeomanNL --- 3,7 ---- Name1 = Uxjoz Name2 = Battleplatform ! Origin = TWa Coders = GeomanNL Gfx = GeomanNL Index: shptauto.ini =================================================================== RCS file: /cvsroot/timewarp/ships/shptauto.ini,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** shptauto.ini 8 Jan 2004 22:21:42 -0000 1.1 --- shptauto.ini 5 Jun 2006 11:59:44 -0000 1.2 *************** *** 1,4 **** [Info] ! Origin = TWB TWCost = 22 Name1 = Tau --- 1,4 ---- [Info] ! Origin = TWa TWCost = 22 Name1 = Tau Index: shpbubbo.ini =================================================================== RCS file: /cvsroot/timewarp/ships/shpbubbo.ini,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** shpbubbo.ini 15 Nov 2003 11:04:18 -0000 1.5 --- shpbubbo.ini 5 Jun 2006 11:59:44 -0000 1.6 *************** *** 3,7 **** Name1 = Bubalos Name2 = Bomber ! Origin = TWb Coders = Tamaraw ; updated by Varith, GeomanNL Gfx = Tau --- 3,7 ---- Name1 = Bubalos Name2 = Bomber ! Origin = TWa Coders = Tamaraw ; updated by Varith, GeomanNL Gfx = Tau Index: shpducla.ini =================================================================== RCS file: /cvsroot/timewarp/ships/shpducla.ini,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** shpducla.ini 11 Jul 2005 00:25:09 -0000 1.8 --- shpducla.ini 5 Jun 2006 11:59:44 -0000 1.9 *************** *** 3,7 **** Name1 = Ducly Name2 = Lanternjaws ! Origin = TWb Gfx = GeomanNL Sfx = none --- 3,7 ---- Name1 = Ducly Name2 = Lanternjaws ! Origin = TWa Gfx = GeomanNL Sfx = none Index: shpkorsi.ini =================================================================== RCS file: /cvsroot/timewarp/ships/shpkorsi.ini,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** shpkorsi.ini 2 Jun 2006 08:34:52 -0000 1.3 --- shpkorsi.ini 5 Jun 2006 11:59:44 -0000 1.4 *************** *** 4,8 **** Name1 = Korvian Name2 = Sidekick - Origin = SC3 Coders = Carlsson Code = KorvianSidekick --- 4,7 ---- Index: shpalhdr.ini =================================================================== RCS file: /cvsroot/timewarp/ships/shpalhdr.ini,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** shpalhdr.ini 26 Feb 2004 21:37:37 -0000 1.11 --- shpalhdr.ini 5 Jun 2006 11:59:44 -0000 1.12 *************** *** 5,9 **** Name1 = Alhordian Name2 = Corona ! Origin = TWb Coders = Varith Code = AlhordianDreadnought --- 5,9 ---- Name1 = Alhordian Name2 = Corona ! Origin = TWa Coders = Varith Code = AlhordianDreadnought Index: shpvioge.ini =================================================================== RCS file: /cvsroot/timewarp/ships/shpvioge.ini,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** shpvioge.ini 11 Jul 2005 00:25:09 -0000 1.4 --- shpvioge.ini 5 Jun 2006 11:59:44 -0000 1.5 *************** *** 3,7 **** Name1 = Viogen Name2 = Genesis ! Origin = TWb Coders = GeomanNL Code = Viogen --- 3,7 ---- Name1 = Viogen Name2 = Genesis ! Origin = TWa Coders = GeomanNL Code = Viogen Index: shpvezba.ini =================================================================== RCS file: /cvsroot/timewarp/ships/shpvezba.ini,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** shpvezba.ini 5 Jan 2004 21:59:54 -0000 1.5 --- shpvezba.ini 5 Jun 2006 11:59:44 -0000 1.6 *************** *** 5,9 **** Name1 = Vezlagari Name2 = Battle Barge ! Origin = TWb Coders = Varith Code = VezlagariBarge --- 5,9 ---- Name1 = Vezlagari Name2 = Battle Barge ! Origin = TWa Coders = Varith Code = VezlagariBarge Index: shpkatpo.ini =================================================================== RCS file: /cvsroot/timewarp/ships/shpkatpo.ini,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** shpkatpo.ini 5 Jan 2004 21:59:54 -0000 1.5 --- shpkatpo.ini 5 Jun 2006 11:59:44 -0000 1.6 *************** *** 3,7 **** Name1 = Kat Name2 = Poly ! Origin = TWb Coders = CyHawk Gfx = CyHawk --- 3,7 ---- Name1 = Kat Name2 = Poly ! Origin = TWa Coders = CyHawk Gfx = CyHawk Index: shpraame.ini =================================================================== RCS file: /cvsroot/timewarp/ships/shpraame.ini,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** shpraame.ini 15 Nov 2003 11:04:18 -0000 1.5 --- shpraame.ini 5 Jun 2006 11:59:44 -0000 1.6 *************** *** 4,8 **** Name1 = Raalrith Name2 = Menacer ! Origin = TWb Coders = Slag-786B Code = RaalrithMenacer --- 4,8 ---- Name1 = Raalrith Name2 = Menacer ! Origin = TWa Coders = Slag-786B Code = RaalrithMenacer *************** *** 37,40 **** [Extra] PhaseMax = 100 ! PoisonDuration = 5000 --- 37,40 ---- [Extra] PhaseMax = 100 ! PoisonDuration = 3000 |
Update of /cvsroot/timewarp/source/newships In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv6416/source/newships Removed Files: shparitr.cpp shpastba.cpp shpbubex.cpp shpdeees.cpp shpdjila.cpp shpimpka.cpp shpjurcu.cpp shpktesa.cpp shpmekpi.cpp shpnisha.cpp shpqlore.cpp shpquawr.cpp shptaume.cpp shptausl.cpp shpterbi.cpp shpvuvji.cpp shpwassu.cpp Log Message: --- shpmekpi.cpp DELETED --- --- shpjurcu.cpp DELETED --- --- shptaume.cpp DELETED --- --- shpktesa.cpp DELETED --- --- shpwassu.cpp DELETED --- --- shparitr.cpp DELETED --- --- shpterbi.cpp DELETED --- --- shptausl.cpp DELETED --- --- shpbubex.cpp DELETED --- --- shpvuvji.cpp DELETED --- --- shpqlore.cpp DELETED --- --- shpimpka.cpp DELETED --- --- shpnisha.cpp DELETED --- --- shpquawr.cpp DELETED --- --- shpastba.cpp DELETED --- --- shpdjila.cpp DELETED --- --- shpdeees.cpp DELETED --- |
|
From: Rob <geo...@us...> - 2006-06-06 03:23:53
|
Update of /cvsroot/timewarp/source/newships In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv22910/source/newships Modified Files: shparkpi.cpp shpilwsp.cpp shpraame.cpp Log Message: Index: shparkpi.cpp =================================================================== RCS file: /cvsroot/timewarp/source/newships/shparkpi.cpp,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** shparkpi.cpp 28 Aug 2005 20:34:07 -0000 1.20 --- shparkpi.cpp 5 Jun 2006 19:03:43 -0000 1.21 *************** *** 650,653 **** --- 650,654 ---- int i; i = iround(damage_factor / 2); + if (i >= BOOM_SAMPLES) i = BOOM_SAMPLES - 1; //double oldMass; //oldMass = mass; Index: shpilwsp.cpp =================================================================== RCS file: /cvsroot/timewarp/source/newships/shpilwsp.cpp,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** shpilwsp.cpp 28 Aug 2005 20:34:08 -0000 1.18 --- shpilwsp.cpp 5 Jun 2006 19:03:44 -0000 1.19 *************** *** 173,177 **** freq = 2000 - 80*(int)other->mass; } ! play_sound2( data->sampleExtra[0], 512, freq<500?500:freq ); game->add( new FixedAnimation( this, other, data->spriteExtra, 0, data->spriteExtra->frames(), time_ratio, LAYER_EXPLOSIONS )); --- 173,179 ---- freq = 2000 - 80*(int)other->mass; } ! if (data->num_extra_samples > 0) ! play_sound2( data->sampleExtra[0]);//, 512, freq<500?500:freq ); ! game->add( new FixedAnimation( this, other, data->spriteExtra, 0, data->spriteExtra->frames(), time_ratio, LAYER_EXPLOSIONS )); Index: shpraame.cpp =================================================================== RCS file: /cvsroot/timewarp/source/newships/shpraame.cpp,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** shpraame.cpp 28 Aug 2005 20:34:08 -0000 1.21 --- shpraame.cpp 5 Jun 2006 19:03:44 -0000 1.22 *************** *** 115,120 **** latched = FALSE; suckStart = TRUE; ! accelerate (this, angle + PI, 15, MAX_SPEED); ! target->accelerate (this, angle, 30, MAX_SPEED); return(TRUE); } --- 115,120 ---- latched = FALSE; suckStart = TRUE; ! accelerate (this, angle + PI, scale_velocity(40.0), MAX_SPEED); ! target->accelerate (this, angle, scale_velocity(20.0), MAX_SPEED); return(TRUE); } |
|
From: Rob <geo...@us...> - 2006-06-06 03:23:53
|
Update of /cvsroot/timewarp/source/menu In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv22910/source/menu Modified Files: editfleet.cpp mainmenu.cpp Log Message: Index: mainmenu.cpp =================================================================== RCS file: /cvsroot/timewarp/source/menu/mainmenu.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** mainmenu.cpp 2 Jun 2006 13:38:22 -0000 1.2 --- mainmenu.cpp 5 Jun 2006 19:03:43 -0000 1.3 *************** *** 165,168 **** --- 165,169 ---- int mainRet; do { + //mainRet = popup_dialog(mainDialog, MAIN_DIALOG_MELEE); mainRet = tw_do_dialog(window, mainDialog, MAIN_DIALOG_MELEE); Index: editfleet.cpp =================================================================== RCS file: /cvsroot/timewarp/source/menu/editfleet.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** editfleet.cpp 2 Jun 2006 08:10:55 -0000 1.1 --- editfleet.cpp 5 Jun 2006 19:03:43 -0000 1.2 *************** *** 34,42 **** FLEET_DIALOG_SHIP_CATAGORIES_TEXT, //TEMP, ! FLEET_DIALOG_SC1_TOGGLE, ! FLEET_DIALOG_SC2_TOGGLE, ! FLEET_DIALOG_SC3_TOGGLE, FLEET_DIALOG_TW_OFFICIAL_TOGGLE, - FLEET_DIALOG_TW_EXP_TOGGLE, FLEET_DIALOG_TW_SPECIAL_TOGGLE, FLEET_DIALOG_SORTBY_TEXT1, --- 34,39 ---- FLEET_DIALOG_SHIP_CATAGORIES_TEXT, //TEMP, ! FLEET_DIALOG_SC_TOGGLE, FLEET_DIALOG_TW_OFFICIAL_TOGGLE, FLEET_DIALOG_TW_SPECIAL_TOGGLE, FLEET_DIALOG_SORTBY_TEXT1, *************** *** 125,142 **** { d_check_proc_fleeteditor, // x=30-->x=10 ! 10, 52, 128, 14, 255, 0, 0,D_EXIT | D_SELECTED, 0, 0, (void *)"SC1", NULL, NULL },//FLEET_DIALOG_SC1_TOGGLE ! { d_check_proc_fleeteditor, ! 10, 66, 128, 14, 255, 0, 0,D_EXIT | D_SELECTED, 0, 0, (void *)"SC2", NULL, NULL },//FLEET_DIALOG_SC2_TOGGLE ! { d_check_proc_fleeteditor, ! 10, 79, 128, 14, 255, 0, 0,D_EXIT | D_SELECTED, 0, 0, (void *)"SC3", NULL, NULL },//FLEET_DIALOG_SC3_TOGGLE { d_check_proc_fleeteditor, ! // 30, 93, 128, 14, 255, 0, 0,D_EXIT | D_SELECTED, 0, 0, (void *)"TW (Official)", NULL, NULL },//FLEET_DIALOG_TW_OFFICIAL_TOGGLE ! 80, 52, 128, 14, 255, 0, 0,D_EXIT | D_SELECTED, 0, 0, (void *)"TW (Official)", NULL, NULL },//FLEET_DIALOG_TW_OFFICIAL_TOGGLE ! { d_check_proc_fleeteditor, ! // 30, 107, 128, 14, 255, 0, 0,D_EXIT, 0, 0, (void *)"TW (Experimental)", NULL, NULL },//FLEET_DIALOG_TW_EXP_TOGGLE ! 80, 66, 128, 14, 255, 0, 0,D_EXIT, 0, 0, (void *)"TW (Experimental)", NULL, NULL },//FLEET_DIALOG_TW_EXP_TOGGLE { d_check_proc_fleeteditor, ! // 30, 107, 128, 14, 255, 0, 0,D_EXIT, 0, 0, (void *)"TW (Special)", NULL, NULL },//FLEET_DIALOG_TW_SPECIAL_TOGGLE ! 80, 79, 128, 14, 255, 0, 0,D_EXIT, 0, 0, (void *)"TW (Special)", NULL, NULL },//FLEET_DIALOG_TW_SPECIAL_TOGGLE { d_textbox_proc, 10, 121, 64, 17, 255, 0, 0, 0, 0, 0, (void *)"Sort By:", NULL, NULL },//FLEET_DIALOG_SORTBY_TEXT1 --- 122,130 ---- { d_check_proc_fleeteditor, // x=30-->x=10 ! 10, 52, 128, 14, 255, 0, 0,D_EXIT | D_SELECTED, 0, 0, (void *)"Star Control", NULL, NULL },//FLEET_DIALOG_SC1_TOGGLE { d_check_proc_fleeteditor, ! 10, 67, 128, 14, 255, 0, 0,D_EXIT | D_SELECTED, 0, 0, (void *)"TW (Official)", NULL, NULL },//FLEET_DIALOG_TW_OFFICIAL_TOGGLE { d_check_proc_fleeteditor, ! 10, 82, 128, 14, 255, 0, 0,D_EXIT, 0, 0, (void *)"TW (Special)", NULL, NULL },//FLEET_DIALOG_TW_SPECIAL_TOGGLE { d_textbox_proc, 10, 121, 64, 17, 255, 0, 0, 0, 0, 0, (void *)"Sort By:", NULL, NULL },//FLEET_DIALOG_SORTBY_TEXT1 *************** *** 147,155 **** 10, 141, 240, 227, 255, 0, 0,D_EXIT, 0, 0, (void *)shippointsListboxGetter, NULL, NULL },//FLEET_DIALOG_AVAILABLE_SHIPS_LIST - //{ d_text_list_proc, - // 10, 141, 240, 227, 255, 0, 0,D_EXIT, 0, 0, (void *)shippointsListboxGetter, NULL, NULL },//FLEET_DIALOG_AVAILABLE_SHIPS_LIST { d_list_proc2, 390, 141, 240, 227, 255, 0, 0,D_EXIT, 0, 0, (void *)fleetpointsListboxGetter, NULL, NULL },//FLEET_DIALOG_FLEET_SHIPS_LIST - // (dialog proc) (x) (y) (w) (h) (fg) (bg) (key) (flags) (d1) (d2) (dp) { my_d_button_proc, 390, 10, 8, 20, 255, 0, 0,D_EXIT, 0, 0, (void *)"+", NULL, NULL },//FLEET_DIALOG_PLAYER_FLEET_BUTTON_INC { my_d_button_proc, 602, 10, 8, 20, 255, 0, 0,D_EXIT, 0, 0, (void *)"-", NULL, NULL },//FLEET_DIALOG_PLAYER_FLEET_BUTTON_DEC --- 135,140 ---- *************** *** 167,171 **** { d_button_proc, 582, 120, 16, 20, 255, 0, 0,D_EXIT, 0, 0, (void *)"^", NULL, NULL },//FLEET_DIALOG_SORTBY_ASCENDING2 - // (dialog proc) (x) (y) (w) (h) (fg) (bg) (key) (flags) (d1) (d2) (dp) { my_d_button_proc, 270, 210, 100, 25, 255, 0, 0,D_EXIT, 0, 0, (void *)"Add", NULL, NULL },//FLEET_DIALOG_ADD_BUTTON { my_d_button_proc, 270, 235, 100, 25, 255, 0, 0,D_EXIT, 0, 0, (void *)"Add All", NULL, NULL },//FLEET_DIALOG_ADD_ALL_BUTTON --- 152,155 ---- *************** *** 175,180 **** 10, 372, 85, 85, 255, 0, 0, 0, 0, 0, (void *)NULL, NULL, NULL },//FLEET_DIALOG_SHIP_PICTURE_BITMAP - //{ d_textbox_proc, 10, 372, 310, 85, 255, 0, 0, 0, 0, 0, (void *)"SHIP PICTURE TODO", NULL, NULL },//FLEET_DIALOG_SHIP_STATS_BITMAP - { d_textbox_proc, 325, 372, 305, 85, 255, 0, 0, 0, 0, 0, (void *)"Summary Text\0 ", NULL, NULL },//FLEET_DIALOG_SHIP_SUMMARY_TEXT --- 159,162 ---- *************** *** 301,329 **** for (int c=0; c<num_shiptypes; c++) { ! switch (shiptypes[c].origin) { ! case SHIP_ORIGIN_SC1: ! if (fleetDialog[FLEET_DIALOG_SC1_TOGGLE].flags & D_SELECTED) ! reference_fleet->addShipType(&shiptypes[c]); ! break; ! ! case SHIP_ORIGIN_SC2: ! if (fleetDialog[FLEET_DIALOG_SC2_TOGGLE].flags & D_SELECTED) ! reference_fleet->addShipType(&shiptypes[c]); ! break; ! ! case SHIP_ORIGIN_SC3: ! if (fleetDialog[FLEET_DIALOG_SC3_TOGGLE].flags & D_SELECTED) reference_fleet->addShipType(&shiptypes[c]); break; ! case SHIP_ORIGIN_TW_ALPHA: if (fleetDialog[FLEET_DIALOG_TW_OFFICIAL_TOGGLE].flags & D_SELECTED) reference_fleet->addShipType(&shiptypes[c]); break; - - case SHIP_ORIGIN_TW_BETA: - if (fleetDialog[FLEET_DIALOG_TW_EXP_TOGGLE].flags & D_SELECTED) - reference_fleet->addShipType(&shiptypes[c]); - break; case SHIP_ORIGIN_TW_SPECIAL: --- 283,297 ---- for (int c=0; c<num_shiptypes; c++) { ! switch (shiptypes[c].origin) ! { ! case SHIP_ORIGIN_SC: ! if (fleetDialog[FLEET_DIALOG_SC_TOGGLE].flags & D_SELECTED) reference_fleet->addShipType(&shiptypes[c]); break; ! case SHIP_ORIGIN_TW_ALPHA: if (fleetDialog[FLEET_DIALOG_TW_OFFICIAL_TOGGLE].flags & D_SELECTED) reference_fleet->addShipType(&shiptypes[c]); break; case SHIP_ORIGIN_TW_SPECIAL: *************** *** 343,351 **** case FLEET_DIALOG_SHIP_CATAGORIES_TEXT: break; ! case FLEET_DIALOG_SC1_TOGGLE: ! case FLEET_DIALOG_SC2_TOGGLE: ! case FLEET_DIALOG_SC3_TOGGLE: case FLEET_DIALOG_TW_OFFICIAL_TOGGLE: - case FLEET_DIALOG_TW_EXP_TOGGLE: case FLEET_DIALOG_TW_SPECIAL_TOGGLE: availableFleetDirty = true; --- 311,316 ---- case FLEET_DIALOG_SHIP_CATAGORIES_TEXT: break; ! case FLEET_DIALOG_SC_TOGGLE: case FLEET_DIALOG_TW_OFFICIAL_TOGGLE: case FLEET_DIALOG_TW_SPECIAL_TOGGLE: availableFleetDirty = true; |
Update of /cvsroot/timewarp/source/sc3ships In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv7237/source/sc3ships Removed Files: shpclapi.cpp shpdakvi.cpp shpdooco.cpp shpexqen.cpp shpherex.cpp shpktacr.cpp shpplopl.cpp shpvyrin.cpp shpxchex.cpp Log Message: --- shpclapi.cpp DELETED --- --- shpdooco.cpp DELETED --- --- shpxchex.cpp DELETED --- --- shpexqen.cpp DELETED --- --- shpplopl.cpp DELETED --- --- shpvyrin.cpp DELETED --- --- shpdakvi.cpp DELETED --- --- shpktacr.cpp DELETED --- --- shpherex.cpp DELETED --- |
|
From: Rob <geo...@us...> - 2006-06-06 03:15:49
|
Update of /cvsroot/timewarp/ships In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv7237/ships Removed Files: shpmoisp.dat shpmoisp.ini shpmoisp.txt Log Message: --- shpmoisp.dat DELETED --- --- shpmoisp.ini DELETED --- --- shpmoisp.txt DELETED --- |
|
From: Rob <geo...@us...> - 2006-06-06 02:42:19
|
Update of /cvsroot/timewarp In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv28270 Modified Files: gflmelee.ini scp.ini twwin.dsp Added Files: alleg40.dll Log Message: --- NEW FILE: alleg40.dll --- (This appears to be a binary file; contents omitted.) Index: gflmelee.ini =================================================================== RCS file: /cvsroot/timewarp/gflmelee.ini,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** gflmelee.ini 4 Jun 2006 13:21:58 -0000 1.14 --- gflmelee.ini 5 Jun 2006 19:16:02 -0000 1.15 *************** *** 23,27 **** [FleetInit] ! Nalliances = 17 PlayerAlliance = 1 --- 23,27 ---- [FleetInit] ! Nalliances = 16 PlayerAlliance = 1 *************** *** 52,61 **** [Alliance03] Name = Disciples of the Exiled Goddess ! Nships = 5 ship01 = ayrbs ! ship02 = bogce ship03 = choex - ship04 = alabc - ship05 = ulzin [Alliance04] --- 52,59 ---- [Alliance03] Name = Disciples of the Exiled Goddess ! Nships = 3 ship01 = ayrbs ! ship02 = alabc ship03 = choex [Alliance04] *************** *** 100,104 **** ship04 = tauem ship05 = taust ! ship06 = tautu ship07 = chmba --- 98,102 ---- ship04 = tauem ship05 = taust ! ship06 = taugl ship07 = chmba *************** *** 151,155 **** Nships = 7 ship01 = taumc ! ship02 = taugl ship03 = conca ship04 = raame --- 149,153 ---- Nships = 7 ship01 = taumc ! ship02 = sacda ship03 = conca ship04 = raame *************** *** 174,178 **** Nships = 7 ship01 = tauto ! ship02 = moisp ship03 = fopsl ship04 = uxjba --- 172,176 ---- Nships = 7 ship01 = tauto ! ship02 = ulzin ship03 = fopsl ship04 = uxjba *************** *** 201,205 **** ship05 = oliha ship06 = fweav ! ship07 = sacda --- 199,203 ---- ship05 = oliha ship06 = fweav ! ship07 = bogce Index: twwin.dsp =================================================================== RCS file: /cvsroot/timewarp/twwin.dsp,v retrieving revision 1.58 retrieving revision 1.59 diff -C2 -d -r1.58 -r1.59 *** twwin.dsp 4 Jun 2006 10:07:46 -0000 1.58 --- twwin.dsp 5 Jun 2006 19:16:02 -0000 1.59 *************** *** 505,536 **** # Begin Source File - SOURCE=.\source\sc3ships\shpclapi.cpp - # End Source File - # Begin Source File - - SOURCE=.\source\sc3ships\shpdakvi.cpp - # End Source File - # Begin Source File - - SOURCE=.\source\sc3ships\shpdooco.cpp - # End Source File - # Begin Source File - - SOURCE=.\source\sc3ships\shpexqen.cpp - # End Source File - # Begin Source File - SOURCE=.\source\sc3ships\shpharra.cpp # End Source File # Begin Source File - SOURCE=.\source\sc3ships\shpherex.cpp - # End Source File - # Begin Source File - - SOURCE=.\source\sc3ships\shpktacr.cpp - # End Source File - # Begin Source File - SOURCE=.\source\sc3ships\shplk_sa.cpp # End Source File --- 505,512 ---- *************** *** 539,554 **** SOURCE=.\source\sc3ships\shpowavo.cpp # End Source File - # Begin Source File - - SOURCE=.\source\sc3ships\shpplopl.cpp - # End Source File - # Begin Source File - - SOURCE=.\source\sc3ships\shpvyrin.cpp - # End Source File - # Begin Source File - - SOURCE=.\source\sc3ships\shpxchex.cpp - # End Source File # End Group # Begin Group "TW_Ships" --- 515,518 ---- *************** *** 573,580 **** # Begin Source File - SOURCE=.\source\newships\shparitr.cpp - # End Source File - # Begin Source File - SOURCE=.\source\newships\shparkpi.cpp # End Source File --- 537,540 ---- *************** *** 585,592 **** # Begin Source File - SOURCE=.\source\newships\shpastba.cpp - # End Source File - # Begin Source File - SOURCE=.\source\newships\shpayrbs.cpp # End Source File --- 545,548 ---- *************** *** 609,616 **** # Begin Source File - SOURCE=.\source\newships\shpbubex.cpp - # End Source File - # Begin Source File - SOURCE=.\source\newships\shpchoex.cpp # End Source File --- 565,568 ---- *************** *** 637,648 **** # Begin Source File - SOURCE=.\source\newships\shpdeees.cpp - # End Source File - # Begin Source File - - SOURCE=.\source\newships\shpdjila.cpp - # End Source File - # Begin Source File - SOURCE=.\source\newships\shpdragr.cpp # End Source File --- 589,592 ---- *************** *** 717,728 **** # Begin Source File - SOURCE=.\source\newships\shpimpka.cpp - # End Source File - # Begin Source File - - SOURCE=.\source\newships\shpjurcu.cpp - # End Source File - # Begin Source File - SOURCE=.\source\newships\shpjygst.cpp # End Source File --- 661,664 ---- *************** *** 749,756 **** # Begin Source File - SOURCE=.\source\newships\shpktesa.cpp - # End Source File - # Begin Source File - SOURCE=.\source\newships\shpleimu.cpp # End Source File --- 685,688 ---- *************** *** 761,772 **** # Begin Source File - SOURCE=.\source\newships\shpmekpi.cpp - # End Source File - # Begin Source File - - SOURCE=.\source\newships\shpmoisp.cpp - # End Source File - # Begin Source File - SOURCE=.\source\newships\shpmontr.cpp # End Source File --- 693,696 ---- *************** *** 781,788 **** # Begin Source File - SOURCE=.\source\newships\shpnisha.cpp - # End Source File - # Begin Source File - SOURCE=.\source\newships\shpoliha.cpp # End Source File --- 705,708 ---- *************** *** 793,808 **** # Begin Source File - SOURCE=.\source\newships\shpqlore.cpp - # End Source File - # Begin Source File - SOURCE=.\source\newships\shpquasi.cpp # End Source File # Begin Source File - SOURCE=.\source\newships\shpquawr.cpp - # End Source File - # Begin Source File - SOURCE=.\source\newships\shpraame.cpp # End Source File --- 713,720 ---- *************** *** 849,860 **** # Begin Source File - SOURCE=.\source\newships\shptaume.cpp - # End Source File - # Begin Source File - - SOURCE=.\source\newships\shptausl.cpp - # End Source File - # Begin Source File - SOURCE=.\source\newships\shptaust.cpp # End Source File --- 761,764 ---- *************** *** 865,876 **** # Begin Source File - SOURCE=.\source\newships\shptautu.cpp - # End Source File - # Begin Source File - - SOURCE=.\source\newships\shpterbi.cpp - # End Source File - # Begin Source File - SOURCE=.\source\newships\shpulzin.cpp # End Source File --- 769,772 ---- *************** *** 889,900 **** # Begin Source File - SOURCE=.\source\newships\shpvuvji.cpp - # End Source File - # Begin Source File - - SOURCE=.\source\newships\shpwassu.cpp - # End Source File - # Begin Source File - SOURCE=.\source\newships\shpwistr.cpp # End Source File --- 785,788 ---- Index: scp.ini =================================================================== RCS file: /cvsroot/timewarp/scp.ini,v retrieving revision 1.42 retrieving revision 1.43 diff -C2 -d -r1.42 -r1.43 *** scp.ini 2 Jun 2006 13:38:21 -0000 1.42 --- scp.ini 5 Jun 2006 19:16:02 -0000 1.43 *************** *** 11,15 **** Fire = 67 AltFire = 63 ! Special = 104 Next_Target = 65 Prev_Target = 66 --- 11,15 ---- Fire = 67 AltFire = 63 ! Special = 70 Next_Target = 65 Prev_Target = 66 |
|
From: Rob <geo...@us...> - 2006-06-06 02:42:19
|
Update of /cvsroot/timewarp/source/menu In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv28218/source/menu Modified Files: editfleet.cpp Log Message: Index: editfleet.cpp =================================================================== RCS file: /cvsroot/timewarp/source/menu/editfleet.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** editfleet.cpp 5 Jun 2006 19:03:43 -0000 1.2 --- editfleet.cpp 5 Jun 2006 19:15:13 -0000 1.3 *************** *** 137,143 **** { d_list_proc2, 390, 141, 240, 227, 255, 0, 0,D_EXIT, 0, 0, (void *)fleetpointsListboxGetter, NULL, NULL },//FLEET_DIALOG_FLEET_SHIPS_LIST ! { my_d_button_proc, 390, 10, 8, 20, 255, 0, 0,D_EXIT, 0, 0, (void *)"+", NULL, NULL },//FLEET_DIALOG_PLAYER_FLEET_BUTTON_INC ! { my_d_button_proc, 602, 10, 8, 20, 255, 0, 0,D_EXIT, 0, 0, (void *)"-", NULL, NULL },//FLEET_DIALOG_PLAYER_FLEET_BUTTON_DEC ! { my_d_button_proc, 400, 10, 200, 20, 255, 0, 0,D_EXIT, 0, 0, (void *)"Player 1 Fleet", NULL, NULL },//FLEET_DIALOG_PLAYER_FLEET_BUTTON { my_d_button_proc, 390, 40, 128, 20, 255, 0, 0,D_EXIT, 0, 0, (void *)"Fleet Title", NULL, NULL },//FLEET_DIALOG_PLAYER_FLEET_TITLE --- 137,143 ---- { d_list_proc2, 390, 141, 240, 227, 255, 0, 0,D_EXIT, 0, 0, (void *)fleetpointsListboxGetter, NULL, NULL },//FLEET_DIALOG_FLEET_SHIPS_LIST ! { my_d_button_proc, 390, 10, 16, 20, 255, 0, 0,D_EXIT, 0, 0, (void *)"+", NULL, NULL },//FLEET_DIALOG_PLAYER_FLEET_BUTTON_INC ! { my_d_button_proc, 610, 10, 16, 20, 255, 0, 0,D_EXIT, 0, 0, (void *)"-", NULL, NULL },//FLEET_DIALOG_PLAYER_FLEET_BUTTON_DEC ! { my_d_button_proc, 408, 10, 200, 20, 255, 0, 0,D_EXIT, 0, 0, (void *)"Player 1 Fleet", NULL, NULL },//FLEET_DIALOG_PLAYER_FLEET_BUTTON { my_d_button_proc, 390, 40, 128, 20, 255, 0, 0,D_EXIT, 0, 0, (void *)"Fleet Title", NULL, NULL },//FLEET_DIALOG_PLAYER_FLEET_TITLE |
|
From: Rob <geo...@us...> - 2006-06-06 02:42:18
|
Update of /cvsroot/timewarp/source/melee In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv22910/source/melee Modified Files: mhelpers.cpp mship.cpp mship.h Log Message: Index: mship.cpp =================================================================== RCS file: /cvsroot/timewarp/source/melee/mship.cpp,v retrieving revision 1.47 retrieving revision 1.48 diff -C2 -d -r1.47 -r1.48 *** mship.cpp 2 Jun 2006 13:38:22 -0000 1.47 --- mship.cpp 5 Jun 2006 19:03:43 -0000 1.48 *************** *** 140,154 **** char *origname = (char*)get_config_string("Info", "Origin", NULL); strupr(origname); ! if (strcmp(origname, "SC1") == 0) ! ori = SHIP_ORIGIN_SC1; ! if (strcmp(origname, "SC2") == 0) ! ori = SHIP_ORIGIN_SC2; ! if (strcmp(origname, "SC3") == 0) ! ori = SHIP_ORIGIN_SC3; ! if ( (strcmp(origname, "TWA") == 0) || // alpha ships ! (strcmp(origname, "TW") == 0) ) ori = SHIP_ORIGIN_TW_ALPHA; ! if (strcmp(origname, "TWB") == 0) // beta ships ! ori = SHIP_ORIGIN_TW_BETA; if (strcmp(origname, "TWS") == 0) // special ships ori = SHIP_ORIGIN_TW_SPECIAL; --- 140,149 ---- char *origname = (char*)get_config_string("Info", "Origin", NULL); strupr(origname); ! if ((strcmp(origname, "SC1") == 0) || (strcmp(origname, "SC2") == 0) || (strcmp(origname, "SC3") == 0)) ! ori = SHIP_ORIGIN_SC; ! ! if ( (strcmp(origname, "TWA") == 0) || (strcmp(origname, "TW") == 0) || (strcmp(origname, "TWB") == 0)) ori = SHIP_ORIGIN_TW_ALPHA; ! if (strcmp(origname, "TWS") == 0) // special ships ori = SHIP_ORIGIN_TW_SPECIAL; Index: mhelpers.cpp =================================================================== RCS file: /cvsroot/timewarp/source/melee/mhelpers.cpp,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** mhelpers.cpp 26 Apr 2006 08:35:38 -0000 1.14 --- mhelpers.cpp 5 Jun 2006 19:03:43 -0000 1.15 *************** *** 358,362 **** show_video_bitmap(video_screen); ! screen = video_screen; show_mouse(screen); --- 358,362 ---- show_video_bitmap(video_screen); ! // screen = video_screen; NOTE: this makes the game unpredictable, and crash on exit ... show_mouse(screen); *************** *** 717,718 **** --- 717,719 ---- return; } + Index: mship.h =================================================================== RCS file: /cvsroot/timewarp/source/melee/mship.h,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** mship.h 5 Oct 2005 20:23:55 -0000 1.26 --- mship.h 5 Jun 2006 19:03:43 -0000 1.27 *************** *** 55,63 **** enum ShipOrigin { SHIP_ORIGIN_NONE = 0, /**< None, no classification given*/ ! SHIP_ORIGIN_SC1,/**< from Star Control 1*/ ! SHIP_ORIGIN_SC2,/**< from Star Control 2*/ ! SHIP_ORIGIN_SC3,/**< from Star Control 3*/ SHIP_ORIGIN_TW_ALPHA,/**< Timewarp "Alpha"*/ - SHIP_ORIGIN_TW_BETA,/**< Timewarp "Beta"*/ SHIP_ORIGIN_TW_SPECIAL/**< Timewarp "Special"*/ }; --- 55,60 ---- enum ShipOrigin { SHIP_ORIGIN_NONE = 0, /**< None, no classification given*/ ! SHIP_ORIGIN_SC,/**< from Star Control 1*/ SHIP_ORIGIN_TW_ALPHA,/**< Timewarp "Alpha"*/ SHIP_ORIGIN_TW_SPECIAL/**< Timewarp "Special"*/ }; |
|
From: Rob <geo...@us...> - 2006-06-06 02:42:17
|
Update of /cvsroot/timewarp/source In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv22910/source Modified Files: gui.cpp scp.cpp Log Message: Index: scp.cpp =================================================================== RCS file: /cvsroot/timewarp/source/scp.cpp,v retrieving revision 1.77 retrieving revision 1.78 diff -C2 -d -r1.77 -r1.78 *** scp.cpp 2 Jun 2006 08:30:30 -0000 1.77 --- scp.cpp 5 Jun 2006 19:03:43 -0000 1.78 *************** *** 1609,1613 **** END_OF_MAIN(); ! int tw_main(int argc, char *argv[]) { STACKTRACE #ifdef WIN32 char szPath[MAX_PATH]; --- 1609,1618 ---- END_OF_MAIN(); ! void test_applic(); ! ! int tw_main(int argc, char *argv[]) ! { ! //test_applic(); ! #ifdef WIN32 char szPath[MAX_PATH]; *************** *** 1617,1620 **** --- 1622,1626 ---- #endif + update_check(argc, argv); *************** *** 2215,2219 **** return; } - - - --- 2221,2222 ---- Index: gui.cpp =================================================================== RCS file: /cvsroot/timewarp/source/gui.cpp,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** gui.cpp 24 Mar 2004 23:51:33 -0000 1.18 --- gui.cpp 5 Jun 2006 19:03:43 -0000 1.19 *************** *** 156,166 **** return; } ! int TW_Dialog_Player::update() { videosystem.poll_redraw(); ! BITMAP *old = screen; ! screen = subscreen; ! if (!player) player = init_dialog(dialog, ifocus); int i = update_dialog ( player ); ! screen = old; if (!i) { return player->obj; --- 156,172 ---- return; } ! ! int TW_Dialog_Player::update() ! { videosystem.poll_redraw(); ! BITMAP *old = gui_get_screen();//screen; ! gui_set_screen(subscreen);//screen = subscreen; ! ! if (!player) ! player = init_dialog(dialog, ifocus); int i = update_dialog ( player ); ! ! gui_set_screen(old);//screen = old; ! if (!i) { return player->obj; |
|
From: Rob <geo...@us...> - 2006-06-06 02:41:25
|
Update of /cvsroot/timewarp/source/games In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv22910/source/games Modified Files: gplanets.cpp Log Message: Index: gplanets.cpp =================================================================== RCS file: /cvsroot/timewarp/source/games/gplanets.cpp,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** gplanets.cpp 2 Jun 2006 08:02:55 -0000 1.18 --- gplanets.cpp 5 Jun 2006 19:03:43 -0000 1.19 *************** *** 1115,1120 **** // also, force the dialog(s) to redraw itself, otherwise this big image // would overwrite all the buttons: ! BITMAP *truescreen = screen; ! screen = tmpscreen; // very dirty, but necessary to re-direct dialog output i = 0; while (Dialog_star[i].proc) --- 1115,1120 ---- // also, force the dialog(s) to redraw itself, otherwise this big image // would overwrite all the buttons: ! BITMAP *truescreen = gui_get_screen();//screen; ! gui_set_screen(tmpscreen);//screen = tmpscreen; // very dirty, but necessary to re-direct dialog output i = 0; while (Dialog_star[i].proc) *************** *** 1123,1127 **** ++i; } ! screen = truescreen; // also, show the moons .. orbiting, for niceness. --- 1123,1128 ---- ++i; } ! gui_set_screen(screen);//screen = truescreen; ! // also, show the moons .. orbiting, for niceness. |
|
From: Rob <geo...@us...> - 2006-06-06 02:41:23
|
Update of /cvsroot/timewarp/ships In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv22442/ships Modified Files: shparkpi.dat shpleimu.dat shplyrwa.dat shpneodr.dat shpuxjba.dat shpvezba.dat shpvioge.dat Log Message: Index: shpleimu.dat =================================================================== RCS file: /cvsroot/timewarp/ships/shpleimu.dat,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Binary files /tmp/cvsyds3Wy and /tmp/cvsbaEZ3L differ Index: shparkpi.dat =================================================================== RCS file: /cvsroot/timewarp/ships/shparkpi.dat,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 Binary files /tmp/cvsTUKelA and /tmp/cvshLWEuN differ Index: shpneodr.dat =================================================================== RCS file: /cvsroot/timewarp/ships/shpneodr.dat,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Binary files /tmp/cvs2qpNbA and /tmp/cvs1h7HoN differ Index: shpuxjba.dat =================================================================== RCS file: /cvsroot/timewarp/ships/shpuxjba.dat,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 Binary files /tmp/cvsNOUFNB and /tmp/cvs7g6C3O differ Index: shpvioge.dat =================================================================== RCS file: /cvsroot/timewarp/ships/shpvioge.dat,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 Binary files /tmp/cvsyplm2F and /tmp/cvsWQgrlT differ Index: shpvezba.dat =================================================================== RCS file: /cvsroot/timewarp/ships/shpvezba.dat,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 Binary files /tmp/cvsaRzYDH and /tmp/cvs9gOSZU differ Index: shplyrwa.dat =================================================================== RCS file: /cvsroot/timewarp/ships/shplyrwa.dat,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 Binary files /tmp/cvsPntk9G and /tmp/cvsMN9syU differ |
|
From: Rob <geo...@us...> - 2006-06-06 02:28:08
|
Update of /cvsroot/timewarp/source/newships In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv12157/source/newships Removed Files: shptautu.cpp Log Message: --- shptautu.cpp DELETED --- |
|
From: Rob <geo...@us...> - 2006-06-06 02:28:08
|
Update of /cvsroot/timewarp/ships In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv12050/ships Removed Files: shptautu.dat shptautu.ini shptautu.txt Log Message: --- shptautu.txt DELETED --- --- shptautu.dat DELETED --- --- shptautu.ini DELETED --- |
|
From: Rob <geo...@us...> - 2006-06-06 02:18:07
|
Update of /cvsroot/timewarp/source/newships In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv7237/source/newships Removed Files: shpmoisp.cpp Log Message: --- shpmoisp.cpp DELETED --- |
|
From: Rob <geo...@us...> - 2006-06-06 02:18:02
|
Update of /cvsroot/timewarp In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv9919 Modified Files: gflmelee.ini Log Message: Index: gflmelee.ini =================================================================== RCS file: /cvsroot/timewarp/gflmelee.ini,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** gflmelee.ini 2 Jun 2006 13:20:17 -0000 1.13 --- gflmelee.ini 4 Jun 2006 13:21:58 -0000 1.14 *************** *** 23,27 **** [FleetInit] ! Nalliances = 19 PlayerAlliance = 1 --- 23,27 ---- [FleetInit] ! Nalliances = 17 PlayerAlliance = 1 *************** *** 51,63 **** [Alliance03] ! Name = League of Sentient Races ! Nships = 7 ! ship01 = clapi ! ship02 = dakvi ! ship03 = harra ! ship04 = ktacr ! ship05 = lk_sa ! ship06 = owavo ! ship07 = xchex [Alliance04] --- 51,61 ---- [Alliance03] ! Name = Disciples of the Exiled Goddess ! Nships = 5 ! ship01 = ayrbs ! ship02 = bogce ! ship03 = choex ! ship04 = alabc ! ship05 = ulzin [Alliance04] *************** *** 81,90 **** ship05 = utwju ship06 = crapl ! ship07 = qlore [Alliance06] Name = Community of Independent Races Nships = 7 ! ship01 = bubex ship02 = bipka ship03 = dragr --- 79,88 ---- ship05 = utwju ship06 = crapl ! ship07 = harra [Alliance06] Name = Community of Independent Races Nships = 7 ! ship01 = lk_sa ship02 = bipka ship03 = dragr *************** *** 100,104 **** ship02 = tauhu ship03 = taufi ! ship04 = taume ship05 = taust ship06 = tautu --- 98,102 ---- ship02 = tauhu ship03 = taufi ! ship04 = tauem ship05 = taust ship06 = tautu *************** *** 131,138 **** Nships = 7 ship01 = gahmo ! ship02 = nisha ship03 = artem ship04 = strgu ! ship05 = djila ship06 = fiear ship07 = quasi --- 129,136 ---- Nships = 7 ship01 = gahmo ! ship02 = owavo ship03 = artem ship04 = strgu ! ship05 = ducla ship06 = fiear ship07 = quasi *************** *** 144,149 **** ship02 = vioge ship03 = katpo ! ship04 = ktesa ! ship05 = ilwsp ship06 = yusra ship07 = fresc --- 142,147 ---- ship02 = vioge ship03 = katpo ! ship04 = xxxma ! ship05 = taule ship06 = yusra ship07 = fresc *************** *** 152,161 **** Name = Empire of Katana Nships = 7 ! ship01 = impka ship02 = taugl ship03 = conca ! ship04 = quawr ship05 = garty ! ship06 = tausl ship07 = neodr --- 150,159 ---- Name = Empire of Katana Nships = 7 ! ship01 = taumc ship02 = taugl ship03 = conca ! ship04 = raame ship05 = garty ! ship06 = sefna ship07 = neodr *************** *** 173,185 **** [Alliance14] ! Name = Space Monsters Nships = 7 ! ship01 = xxxma ! ship02 = ducla ! ship03 = taule ! ship04 = deees ! ship05 = wassu ! ship06 = raame ! ship07 = sefna [Alliance15] --- 171,183 ---- [Alliance14] ! Name = The Ophiuchi Tribes Nships = 7 ! ship01 = tauto ! ship02 = moisp ! ship03 = fopsl ! ship04 = uxjba ! ship05 = clofl ! ship06 = gluse ! ship07 = ostor [Alliance15] *************** *** 187,193 **** Nships = 7 ship01 = orzne ! ship02 = aritr ship03 = arisk ! ship04 = herex ship05 = montr ship06 = raame --- 185,191 ---- Nships = 7 ship01 = orzne ! ship02 = crore ship03 = arisk ! ship04 = aktgu ship05 = montr ship06 = raame *************** *** 203,239 **** ship05 = oliha ship06 = fweav ! ship07 = mekpi - [Alliance17] - Name = The Ophiuchi Tribes - Nships = 7 - ship01 = tauto - ship02 = moisp - ship03 = fopsl - ship04 = uxjba - ship05 = clofl - ship06 = gluse - ship07 = tauem - [Alliance18] - Name = The Democrats of Ayron - Nships = 7 - ship01 = ostor - ship02 = sacda - ship03 = aktgu - ship04 = astba - ship05 = crore - ship06 = taumc - ship07 = vuvji - [Alliance19] - Name = Disciples of the Exiled Goddess - Nships = 5 - ship01 = ayrbs - ship02 = bogce - ship03 = choex - ship04 = alabc - ship05 = ulzin --- 201,211 ---- ship05 = oliha ship06 = fweav ! ship07 = sacda ! ! |
Update of /cvsroot/timewarp/ships/sc3 In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv5954/ships/sc3 Modified Files: shpharra.ini shplk_sa.ini shpowavo.ini Removed Files: shpclapi.dat shpclapi.ini shpdakvi.dat shpdakvi.ini shpdooco.dat shpdooco.ini shpexqen.dat shpexqen.ini shpherex.dat shpherex.ini shpktacr.dat shpktacr.ini shpplopl.dat shpplopl.ini shpvyrin.dat shpvyrin.ini shpxchex.dat shpxchex.ini Log Message: --- shpexqen.ini DELETED --- --- shpclapi.dat DELETED --- --- shpdakvi.dat DELETED --- --- shpvyrin.ini DELETED --- Index: shplk_sa.ini =================================================================== RCS file: /cvsroot/timewarp/ships/sc3/shplk_sa.ini,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** shplk_sa.ini 26 Oct 2003 10:43:17 -0000 1.5 --- shplk_sa.ini 4 Jun 2006 13:12:12 -0000 1.6 *************** *** 4,8 **** Name1 = Lk Name2 = Sanctorum ! Origin = SC3 Coders = Launchpad Code = LkSanctorum --- 4,8 ---- Name1 = Lk Name2 = Sanctorum ! Origin = TWa Coders = Launchpad Code = LkSanctorum --- shpexqen.dat DELETED --- --- shpherex.ini DELETED --- --- shpherex.dat DELETED --- --- shpktacr.ini DELETED --- --- shpvyrin.dat DELETED --- Index: shpowavo.ini =================================================================== RCS file: /cvsroot/timewarp/ships/sc3/shpowavo.ini,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** shpowavo.ini 26 Oct 2003 10:43:17 -0000 1.5 --- shpowavo.ini 4 Jun 2006 13:12:12 -0000 1.6 *************** *** 4,8 **** Name1 = Owa Name2 = Voyager ! Origin = SC3 Coders = Launchpad Code = OwaVoyager --- 4,8 ---- Name1 = Owa Name2 = Voyager ! Origin = TWb Coders = Launchpad Code = OwaVoyager Index: shpharra.ini =================================================================== RCS file: /cvsroot/timewarp/ships/sc3/shpharra.ini,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** shpharra.ini 26 Oct 2003 10:43:17 -0000 1.5 --- shpharra.ini 4 Jun 2006 13:12:12 -0000 1.6 *************** *** 4,8 **** Name1 = Harika & Yorn Name2 = Ravager ! Origin = SC3 Coders = Launchpad Code = HarikaYornRavager --- 4,8 ---- Name1 = Harika & Yorn Name2 = Ravager ! Origin = TWa Coders = Launchpad Code = HarikaYornRavager --- shpclapi.ini DELETED --- --- shpdakvi.ini DELETED --- --- shpktacr.dat DELETED --- --- shpxchex.dat DELETED --- --- shpplopl.dat DELETED --- --- shpdooco.dat DELETED --- --- shpdooco.ini DELETED --- --- shpplopl.ini DELETED --- --- shpxchex.ini DELETED --- |
|
From: Rob <geo...@us...> - 2006-06-06 02:17:27
|
Update of /cvsroot/timewarp In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv23040 Modified Files: twwin.dsp Log Message: Index: twwin.dsp =================================================================== RCS file: /cvsroot/timewarp/twwin.dsp,v retrieving revision 1.57 retrieving revision 1.58 diff -C2 -d -r1.57 -r1.58 *** twwin.dsp 2 Jun 2006 13:38:21 -0000 1.57 --- twwin.dsp 4 Jun 2006 10:07:46 -0000 1.58 *************** *** 54,58 **** LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386 ! # ADD LINK32 ./lib/alleg.lib user32.lib winmm.lib wsock32.lib ./lib/libjgmod.lib ./lib/lua.lib ./lib/libfreetype.lib /nologo /subsystem:windows /incremental:yes /map /debug /machine:I386 /nodefaultlib:"LIBCMT" /out:"twwin.exe" # SUBTRACT LINK32 /pdb:none --- 54,58 ---- LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386 ! # ADD LINK32 ./lib/alleg.lib user32.lib winmm.lib wsock32.lib ./lib/libjgmod.lib ./lib/libfreetype.lib /nologo /subsystem:windows /incremental:yes /map /debug /machine:I386 /out:"twwin.exe" # SUBTRACT LINK32 /pdb:none *************** *** 81,85 **** LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept ! # ADD LINK32 ./lib/libfreetype.lib ./lib/alld.lib user32.lib winmm.lib wsock32.lib ./lib/libjgmod.lib ./lib/luad.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"LIBCMT" /out:"twwin_DEBUG.exe" /pdbtype:sept # SUBTRACT LINK32 /pdb:none --- 81,85 ---- LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept ! # ADD LINK32 ./lib/libfreetype.lib ./lib/alld.lib user32.lib winmm.lib wsock32.lib ./lib/libjgmod.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"LIBCMT" /out:"twwin_DEBUG.exe" /pdbtype:sept # SUBTRACT LINK32 /pdb:none *************** *** 1125,1128 **** --- 1125,1180 ---- # End Source File # End Group + # Begin Group "jgmod" + + # PROP Default_Filter "" + # Begin Source File + + SOURCE=.\source\jgmod\file_io.c + # End Source File + # Begin Source File + + SOURCE=.\source\jgmod\file_io.h + # End Source File + # Begin Source File + + SOURCE=.\source\jgmod\jgmod.h + # End Source File + # Begin Source File + + SOURCE=.\source\jgmod\jshare.h + # End Source File + # Begin Source File + + SOURCE=.\source\jgmod\load_it.c + # End Source File + # Begin Source File + + SOURCE=.\source\jgmod\load_jgm.c + # End Source File + # Begin Source File + + SOURCE=.\source\jgmod\load_mod.c + # End Source File + # Begin Source File + + SOURCE=.\source\jgmod\load_s3m.c + # End Source File + # Begin Source File + + SOURCE=.\source\jgmod\load_xm.c + # End Source File + # Begin Source File + + SOURCE=.\source\jgmod\mod.c + # End Source File + # Begin Source File + + SOURCE=.\source\jgmod\port.h + # End Source File + # Begin Source File + + SOURCE=.\source\jgmod\save_jgm.c + # End Source File + # End Group # Begin Source File |
5 messages has been excluded from this view by a project administrator.
