/programs/games/doom/trunk/system/include/sound.h |
---|
File deleted |
/programs/games/doom/trunk/system/include/kolibri.h |
---|
File deleted |
/programs/games/doom/trunk/kolibc/include/sound.h |
---|
0,0 → 1,134 |
#ifndef _SOUND_H_ |
#define _SOUND_H_ |
#ifdef __cplusplus |
extern "C" |
{ |
#endif |
#define SOUND_VERSION 5 |
#define PCM_ALL 0 |
#define PCM_OUT 0x08000000 |
#define PCM_RING 0x10000000 |
#define PCM_STATIC 0x20000000 |
#define PCM_FLOAT 0x40000000 |
#define PCM_FILTER 0x80000000 |
#define PCM_2_16_48 1 |
#define PCM_1_16_48 2 |
#define PCM_2_16_44 3 |
#define PCM_1_16_44 4 |
#define PCM_2_16_32 5 |
#define PCM_1_16_32 6 |
#define PCM_2_16_24 7 |
#define PCM_1_16_24 8 |
#define PCM_2_16_22 9 |
#define PCM_1_16_22 10 |
#define PCM_2_16_16 11 |
#define PCM_1_16_16 12 |
#define PCM_2_16_12 13 |
#define PCM_1_16_12 14 |
#define PCM_2_16_11 15 |
#define PCM_1_16_11 16 |
#define PCM_2_16_8 17 |
#define PCM_1_16_8 18 |
#define PCM_2_8_48 19 |
#define PCM_1_8_48 20 |
#define PCM_2_8_44 21 |
#define PCM_1_8_44 22 |
#define PCM_2_8_32 23 |
#define PCM_1_8_32 24 |
#define PCM_2_8_24 25 |
#define PCM_1_8_24 26 |
#define PCM_2_8_22 27 |
#define PCM_1_8_22 28 |
#define PCM_2_8_16 29 |
#define PCM_1_8_16 30 |
#define PCM_2_8_12 31 |
#define PCM_1_8_12 32 |
#define PCM_2_8_11 33 |
#define PCM_1_8_11 34 |
#define PCM_2_8_8 35 |
#define PCM_1_8_8 36 |
#define SRV_GETVERSION 0 |
#define SND_CREATE_BUFF 1 |
#define SND_DESTROY_BUFF 2 |
#define SND_SETFORMAT 3 |
#define SND_GETFORMAT 4 |
#define SND_RESET 5 |
#define SND_SETPOS 6 |
#define SND_GETPOS 7 |
#define SND_SETBUFF 8 |
#define SND_OUT 9 |
#define SND_PLAY 10 |
#define SND_STOP 11 |
#define SND_SETVOLUME 12 |
#define SND_GETVOLUME 13 |
#define SND_SETPAN 14 |
#define SND_GETPAN 15 |
#define SND_GETBUFFSIZE 16 |
#define PLAY_SYNC 0x80000000 |
typedef unsigned int SNDBUF; |
int _stdcall InitSound(int *version); |
int _stdcall CreateBuffer(unsigned int format,int size,SNDBUF *buf); |
int _stdcall DestroyBuffer(SNDBUF hBuff); |
int _stdcall SetFormat(SNDBUF hBuff, unsigned int format); |
int _stdcall GetFormat(SNDBUF hBuff, unsigned int *format); |
int _stdcall ResetBuffer(SNDBUF hBuff, unsigned int flags); |
int _stdcall SetBufferPos(SNDBUF hBuff, int offset); |
int _stdcall GetBufferPos(SNDBUF hBuff, int *offset); |
int _stdcall GetBufferSize(SNDBUF hBuff, int *size); |
int _stdcall SetBuffer(SNDBUF hBuff,void* buff, |
int offs, int size); |
int _stdcall WaveOut(SNDBUF hBuff,void *buff, int size); |
int _stdcall PlayBuffer(SNDBUF hBuff,unsigned int flags); |
int _stdcall StopBuffer(SNDBUF hBuff); |
int _stdcall SetVolume(SNDBUF hBuff, int left, int right); |
int _stdcall GetVolume(SNDBUF hBuff, int *left, int *right); |
int _stdcall SetPan(SNDBUF hBuff, int pan); |
int _stdcall GetPan(SNDBUF hBuff, int *pan); |
int _stdcall GetMasterVol(int* vol); |
int _stdcall SetMasterVol(int vol); |
typedef struct |
{ |
unsigned int riff_id; |
unsigned int riff_size; |
unsigned int riff_format; |
unsigned int fmt_id; |
unsigned int fmt_size; |
unsigned short int wFormatTag; |
unsigned short int nChannels; |
unsigned int nSamplesPerSec; |
unsigned int nAvgBytesPerSec; |
unsigned short int nBlockAlign; |
unsigned short int wBitsPerSample; |
unsigned int data_id; |
unsigned int data_size; |
} WAVEHEADER; |
unsigned int _stdcall test_wav(WAVEHEADER *hdr); |
#ifdef __cplusplus |
extern "C" |
} |
#endif |
#endif //_SOUND_H_ |
/programs/games/doom/trunk/kolibc/include/kolibri.h |
---|
0,0 → 1,105 |
#ifdef __cplusplus |
extern "C" |
{ |
#endif |
#define FONT0 0x00000000 |
#define FONT1 0x10000000 |
#define BT_NORMAL 0x00000000 |
#define BT_NOFRAME 0x20000000 |
#define BT_HIDE 0x40000000 |
#define BT_DEL 0x80000000 |
#define EV_REDRAW 1 |
#define EV_KEY 2 |
#define EV_BUTTON 3 |
#define REL_SCREEN 0 |
#define REL_WINDOW 1 |
#define FILE_NOT_FOUND 5 |
#define FILE_EOF 6 |
typedef unsigned int DWORD; |
typedef unsigned short int WORD; |
typedef struct |
{ DWORD pci_cmd; |
DWORD irq; |
DWORD glob_cntrl; |
DWORD glob_sta; |
DWORD codec_io_base; |
DWORD ctrl_io_base; |
DWORD codec_mem_base; |
DWORD ctrl_mem_base; |
DWORD codec_id; |
} CTRL_INFO; |
typedef struct |
{ DWORD cmd; |
DWORD offset; |
DWORD r1; |
DWORD count; |
DWORD buff; |
char r2; |
char *name; |
} FILEIO; |
typedef struct |
{ DWORD attr; |
DWORD flags; |
DWORD cr_time; |
DWORD cr_date; |
DWORD acc_time; |
DWORD acc_date; |
DWORD mod_time; |
DWORD mod_date; |
DWORD size; |
DWORD size_high; |
} FILEINFO; |
void _stdcall InitHeap(int heap_size); |
void* _stdcall UserAlloc(int size); |
int _stdcall UserFree(void* p); |
void _stdcall GetNotify(void *event); |
void _stdcall CreateThread(void *fn, char *p_stack); |
DWORD _stdcall GetMousePos(DWORD rel_type); |
void _stdcall debug_out_hex(DWORD val); |
void debug_out_str(char* str); |
int _stdcall get_fileinfo(const char *name,FILEINFO* pinfo); |
int _stdcall read_file (const char *name,char*buff,DWORD offset, DWORD count,DWORD *reads); |
int _stdcall write_file(const char *name,char*buff,int offset,int count,int *writes); |
//void exit(); |
int _stdcall get_key(int *key); |
int _stdcall remap_key(int key); |
int _cdecl get_button_id(); |
void delay(int val); |
int wait_for_event(int time); |
int wait_for_event_infinite(); |
void BeginDraw(void); |
void EndDraw(void); |
void _stdcall GetScreenSize(int *x, int*y); |
void _stdcall DrawWindow(int x,int y, int sx, int sy,int workcolor,int style, |
int captioncolor,int windowtype,int bordercolor); |
void _stdcall debug_out(int ch); |
void _stdcall make_button(int x, int y, int xsize, int ysize, int id, int color); |
void _stdcall draw_bar(int x, int y, int xsize, int ysize, int color); |
void _stdcall write_text(int x,int y,int color,char* text,int len); |
#ifdef __cplusplus |
extern "C" |
} |
#endif |
/programs/games/doom/trunk/kolibc/include/kolibc.h |
---|
0,0 → 1,177 |
#ifndef kolibc_h |
#define kolibc_h |
#ifdef __cplusplus |
extern "C" |
{ |
#endif |
typedef unsigned char byte; |
typedef unsigned short int word; |
typedef unsigned int dword; |
typedef unsigned int fpos_t; |
typedef unsigned int size_t; |
#//define NULL (void*)0 |
#define SEEK_SET 0 |
#define SEEK_CUR 1 |
#define SEEK_END 2 |
#define FILE_OPEN_READ 0x01 |
#define FILE_OPEN_WRITE 0x02 |
#define FILE_OPEN_APPEND 0x04 |
#define FILE_OPEN_TEXT 0x08 |
#define FILE_OPEN_PLUS 0x10 |
#define EOF -1 |
typedef struct |
{ |
char *buffer; |
char *stream; |
size_t strpos; |
size_t remain; |
size_t filepos; |
size_t buffersize; |
size_t filesize; |
char* filename; |
int mode; |
} FILE; |
extern FILE* fopen(const char* filename, const char *mode); |
extern int fclose(FILE* file); |
extern int feof(FILE* file); |
extern int fflush(FILE* file); |
extern int fgetc(FILE* file); |
extern int fgetpos(FILE* file,fpos_t* pos); |
extern int fsetpos(FILE* file,const fpos_t* pos); |
extern int fputc(int c,FILE* file); |
extern int fread(void* buffer,size_t size,size_t count,FILE* file); |
extern int fwrite(const void* buffer,size_t size,size_t count,FILE* file); |
extern long ftell(FILE* file); |
extern int fseek(FILE* file,long offset,int origin); |
extern void rewind(FILE* file); |
extern int fprintf(FILE* file, const char* format, ...); |
extern int fscanf(FILE* file,const char* format, ...); |
extern int ungetc(int c,FILE* file); |
extern int sprintf(char *dest, const char *format,...); |
extern int printf(const char *format,...); |
typedef char *va_list; |
#define _roundsize(n) ( (sizeof(n) + 3) & ~3 ) |
#define va_start(ap,v) (ap = (va_list)&v+_roundsize(v)) |
#define va_arg(ap,t) ( *(t *)((ap += _roundsize(t)) - _roundsize(t)) ) |
#define va_end(ap) (ap = (va_list)0) |
/* |
** All character classification functions except isascii(). |
** Integer argument (c) must be in ASCII range (0-127) for |
** dependable answers. |
*/ |
#define ALNUM 1 |
#define ALPHA 2 |
#define CNTRL 4 |
#define DIGIT 8 |
#define GRAPH 16 |
#define LOWER 32 |
#define PRINT 64 |
#define PUNCT 128 |
#define BLANK 256 |
#define UPPER 512 |
#define XDIGIT 1024 |
extern short int _is[128]; |
#define isalnum(c)(_is[c] & ALNUM ) /* 'a'-'z', 'A'-'Z', '0'-'9' */ |
#define isalpha(c)(_is[c] & ALPHA ) /* 'a'-'z', 'A'-'Z' */ |
#define iscntrl(c)(_is[c] & CNTRL ) /* 0-31, 127 */ |
#define isdigit(c)(_is[c] & DIGIT ) /* '0'-'9' */ |
#define isgraph(c)(_is[c] & GRAPH ) /* '!'-'~' */ |
#define islower(c)(_is[c] & LOWER ) /* 'a'-'z' */ |
#define isprint(c)(_is[c] & PRINT ) /* ' '-'~' */ |
#define ispunct(c)(_is[c] & PUNCT ) /* !alnum && !cntrl && !space */ |
#define isspace(c)(_is[c] & BLANK ) /* HT, LF, VT, FF, CR, ' ' */ |
#define isupper(c)(_is[c] & UPPER ) /* 'A'-'Z' */ |
#define isxdigit(c)(_is[c] & XDIGIT) /* '0'-'9', 'a'-'f', 'A'-'F' */ |
#define _LOWER 0x80 |
#define _UPPER 0x40 |
#define _DIGIT 0x20 |
#define _XDIGT 0x10 |
#define _PRINT 0x08 |
#define _PUNCT 0x04 |
#define _SPACE 0x02 |
#define _CNTRL 0x01 |
#define abs(i) (((i)<0)?(-(i)):(i)) |
#if 0 |
extern int atoib(char *s,int b); |
extern int atoi(char *s); |
extern char tolower(char c); |
extern char toupper(char c); |
extern void itoab(int n,char* s,int b); |
extern void itoa(int n,char* s); |
extern char* strcat(char*,const char*); |
extern char* strchr(const char*,int); |
extern int strcmp(const char*,const char*); |
extern int strcoll(const char*,const char*); |
extern char* strcpy(char*,const char*); |
extern int strcspn(const char*,const char*); |
extern size_t strlen(const char*); |
extern char* strncat(char*,const char*,int); |
extern int strncmp(const char*,const char*,int); |
extern char* strncpy(char*,const char*,int); |
extern char* strpbrk(const char*,const char*); |
extern char* strrchr(const char*,int); |
extern int strspn(const char*,const char*); |
extern char* strstr(const char*,const char*); |
extern char* strtok(char*,const char*); |
extern int strxfrm(char*,const char*,int); |
extern char* strdup(const char*); |
extern char toupper(char c); |
#define isascii(char) ( (unsigned)char < 0x80 ) |
extern void* memchr(const void*,int,int); |
extern extern void* memchr(const void*,int,int); |
extern int memcmp(const void*,const void*,int); |
extern void* memcpy(void*,const void*,size_t); |
void kmemset (void *dst, int val, size_t count); |
extern void* memmove(void*,const void*,int); |
extern void* memset(void*,int,int); |
int memcmp(const void*,const void*,int); |
extern void* memcpy(void*,const void*,size_t); |
void kmemset (void *dst, int val, size_t count); |
extern void* memmove(void*,const void*,int); |
extern void* memset(void*,int,int); |
#endif |
void debug_out_str(char* str); |
void* _cdecl dlmalloc(size_t size); |
void* _cdecl dlrealloc(void* oldmem, size_t bytes); |
void _cdecl dlfree(void *mem); |
//double pow_test(x,y); |
#ifdef __cplusplus |
extern "C" |
} |
#endif |
#endif //kolibc_h |
/programs/games/doom/trunk/kolibc/include/mf.h |
---|
0,0 → 1,100 |
//#include "kolibc.h" |
#ifdef __cplusplus |
extern "C" { |
#endif /* __cplusplus */ |
typedef unsigned int dword; |
typedef unsigned int size_t; |
#define PINUSE_BIT 1 |
#define CINUSE_BIT 2 |
#define INUSE_BITS 3 |
struct m_seg |
{ |
char* base; /* base address */ |
dword size; /* allocated size */ |
struct m_seg* next; /* ptr to next segment */ |
dword flags; /* mmap and extern flag */ |
}; |
struct m_chunk |
{ |
dword prev_foot; /* Size of previous chunk (if free). */ |
dword head; /* Size and inuse bits. */ |
struct m_chunk* fd; /* double links -- used only if free. */ |
struct m_chunk* bk; |
}; |
typedef struct m_chunk* mchunkptr; |
struct t_chunk |
{ |
/* The first four fields must be compatible with malloc_chunk */ |
dword prev_foot; |
dword head; |
struct t_chunk* fd; |
struct t_chunk* bk; |
struct t_chunk* child[2]; |
struct t_chunk* parent; |
dword index; |
}; |
typedef struct t_chunk* tchunkptr; |
typedef struct t_chunk* tbinptr; |
typedef struct m_state |
{ |
dword smallmap; |
dword treemap; |
// DWORD dvsize; |
dword topsize; |
char* least_addr; |
// mchunkptr dv; |
mchunkptr top; |
dword magic; |
struct m_chunk smallbins[32]; |
tbinptr treebins[32]; |
}; |
void _cdecl mf_init(); |
void* _cdecl dlmalloc(size_t); |
void* _cdecl dlrealloc(void *,size_t); |
void _cdecl dlfree(void*); |
dword compute_tree_index(size_t s); |
static void insert_chunk(mchunkptr P, size_t S); |
static void insert_large_chunk(tchunkptr X, size_t S); |
static void unlink_large_chunk(tchunkptr X); |
//void replace_dv(mchunkptr P, size_t S); |
static void* malloc_small(size_t nb); |
static void* malloc_large(size_t nb); |
#define leftshift_for_tree_index(i) \ |
((i == 31)? 0 : (31 - (i >> 1) + 8 - 2)) |
#define leftmost_child(t) ((t)->child[0] != 0? (t)->child[0] : (t)->child[1]) |
#define chunk2mem(p) (void*)((char*)p + 8) |
#define mem2chunk(mem) (mchunkptr)((char*)mem - 8) |
#define chunk_plus_offset(p, s) ((mchunkptr)(((char*)(p)) + (s))) |
#ifdef __cplusplus |
} |
#endif /* __cplusplus */ |
/programs/games/doom/trunk/s_sound.c |
---|
257,22 → 257,10 |
} |
if( SOUND_VERSION>(ver&0xFFFF)) |
if(ver< SOUND_VERSION) |
{ |
printf("Sound version mismatch\n\r"); |
printf("Current version: %d, required version %d\n\r", |
ver&0xFFFF, SOUND_VERSION); |
_asm |
{ |
mov eax, -1 |
int 0x40 |
}; |
}; |
if(SOUND_VERSION<(ver >> 16)) |
{ |
printf("Sound version obsolete\n\r"); |
printf("Compatible version: %d, required version %d\n\r", |
printf("Sound service version mismatch\n\r"); |
printf("Installed version: %d, required version %d\n\r", |
ver, SOUND_VERSION); |
_asm |
{ |
/programs/games/doom/trunk/d_main.c |
---|
1168,9 → 1168,9 |
if (p && p < myargc-1) |
{ |
if (M_CheckParm("-cdrom")) |
sprintf(file, "c:\\doomdata\\doomsav%c.dsg",myargv[p+1][0]); |
sprintf(file, "c:\\doomdata\\"SAVEGAMENAME"%c.dsg",myargv[p+1][0]); |
else |
sprintf(file, "doomsav%c.dsg",myargv[p+1][0]); |
sprintf(file, SAVEGAMENAME"%c.dsg",myargv[p+1][0]); |
G_LoadGame (file); |
} |
/programs/games/doom/trunk/h/dstrings.h |
---|
38,7 → 38,7 |
#endif |
// Misc. other strings. |
//#define SAVEGAMENAME "doomsav" |
#define SAVEGAMENAME "doomsav" |
// |
/programs/games/doom/trunk/h/kolibri.h |
---|
0,0 → 1,121 |
#ifdef __cplusplus |
extern "C" |
{ |
#endif |
#define FONT0 0x00000000 |
#define FONT1 0x10000000 |
#define BT_NORMAL 0x00000000 |
#define BT_NOFRAME 0x20000000 |
#define BT_HIDE 0x40000000 |
#define BT_DEL 0x80000000 |
#define EV_REDRAW 1 |
#define EV_KEY 2 |
#define EV_BUTTON 3 |
#define REL_SCREEN 0 |
#define REL_WINDOW 1 |
#define FILE_NOT_FOUND 5 |
#define FILE_EOF 6 |
typedef unsigned int DWORD; |
typedef unsigned short int WORD; |
typedef struct |
{ DWORD pci_cmd; |
DWORD irq; |
DWORD glob_cntrl; |
DWORD glob_sta; |
DWORD codec_io_base; |
DWORD ctrl_io_base; |
DWORD codec_mem_base; |
DWORD ctrl_mem_base; |
DWORD codec_id; |
} CTRL_INFO; |
typedef struct |
{ DWORD cmd; |
DWORD offset; |
DWORD r1; |
DWORD count; |
DWORD buff; |
char r2; |
char *name; |
} FILEIO; |
typedef struct |
{ DWORD attr; |
DWORD flags; |
DWORD cr_time; |
DWORD cr_date; |
DWORD acc_time; |
DWORD acc_date; |
DWORD mod_time; |
DWORD mod_date; |
DWORD size; |
DWORD size_high; |
} FILEINFO; |
void _stdcall InitHeap(int heap_size); |
void* _stdcall UserAlloc(int size); |
void _stdcall GetNotify(DWORD *event); |
//void _stdcall CreateThread(void *fn, char *p_stack); |
DWORD _stdcall GetMousePos(DWORD rel_type); |
int _stdcall GetService(char *srv_name); |
void _stdcall GetDevInfo(DWORD hSrv,CTRL_INFO *pInfo); |
int _stdcall GetMasterVol(DWORD hSrv,int* vol); |
int _stdcall SetMasterVol(DWORD hSrv, int vol); |
DWORD _stdcall CreateBuffer(DWORD hSrv, DWORD format); |
int _stdcall DestroyBuffer(DWORD hSrv, DWORD hBuff); |
int _stdcall SetBuffer(DWORD hSrv, DWORD hBuff,char* buff, |
DWORD offs, int size); |
int _stdcall PlayBuffer(DWORD hSrv, DWORD hBuff); |
int _stdcall StopBuffer(DWORD hSrv, DWORD hBuff); |
void _stdcall debug_out_hex(DWORD val); |
//void debug_out_str(char* str); |
int _stdcall get_fileinfo(char *name,FILEINFO* pinfo); |
int _stdcall read_file (char *name,char*buff,int offset, int count,int *reads); |
int _stdcall write_file(char *name,char*buff,int offset,int count,int *writes); |
//void exit(); |
int _stdcall get_key(int *key); |
int _stdcall remap_key(int key); |
int _cdecl get_button_id(); |
void delay(int val); |
int wait_for_event(int time); |
int wait_for_event_infinite(); |
//void BeginDraw(void); |
//void EndDraw(void); |
void _stdcall DrawWindow(int x,int y, int sx, int sy,int workcolor,int style, |
int captioncolor,int windowtype,int bordercolor); |
void _stdcall debug_out(int ch); |
void _stdcall make_button(int x, int y, int xsize, int ysize, int id, int color); |
void _stdcall draw_bar(int x, int y, int xsize, int ysize, int color); |
void _stdcall write_text(int x,int y,int color,char* text,int len); |
void _cdecl mf_init(); |
void* _cdecl dlmalloc(size_t size); |
void _cdecl dlfree(void *mem); |
void* _cdecl dlrealloc(void* oldmem, size_t bytes); |
#ifdef __cplusplus |
extern "C" |
} |
#endif |
/programs/games/doom/trunk/w_wad.c |
---|
42,10 → 42,22 |
extern char *main_file; |
#ifdef DLHEAP |
void* _cdecl dlmalloc(size_t); |
void _cdecl dlfree(void*); |
void _cdecl mf_init(); |
#define malloc dlmalloc |
#define free dlfree |
#define realloc dlrealloc |
#endif |
size_t FileSize(FILE *handle); |
//int _stdcall read_file (char *name, void *buff, |
// size_t offset, size_t count, size_t *reads); |
int _stdcall read_file (char *name, void *buff, |
size_t offset, size_t count, size_t *reads); |
184,6 → 196,7 |
length = header.numlumps*sizeof(filelump_t); |
fileinfo = alloca(length); |
fseek (handle, header.infotableofs, SEEK_SET); |
fread (fileinfo, 1, length, handle); |
numlumps += header.numlumps; |
/programs/games/doom/trunk/g_game.c |
---|
1269,13 → 1269,13 |
void G_DoSaveGame (void) |
{ |
char name[128]; |
char name[100]; |
char name2[VERSIONSIZE]; |
char* description; |
int length; |
int i; |
sprintf (name,"doomsav%d.dsg",savegameslot); |
sprintf (name,"%d.dsg",savegameslot); |
description = savedescription; |
save_p = savebuffer = screens[1]+0x4000; |
1306,7 → 1306,6 |
length = save_p - savebuffer; |
if (length > SAVEGAMESIZE) |
I_Error ("Savegame buffer overrun"); |
M_WriteFile (name, savebuffer, length); |
gameaction = ga_nothing; |
savedescription[0] = 0; |
/programs/games/doom/trunk/m_misc.c |
---|
29,6 → 29,7 |
#include <stdlib.h> |
#include <ctype.h> |
//#include "//kolibc.h" |
//extern int access(char *file, int mode); |
105,8 → 106,6 |
#define O_BINARY 0 |
#endif |
int write_once(const char *name, void *buffer, unsigned len); |
boolean |
M_WriteFile |
( char const* name, |
113,21 → 112,16 |
void* source, |
int length ) |
{ |
// FILE *handle; |
FILE *handle; |
int count; |
// handle = fopen ( name, "wb"); |
handle = fopen ( name, "wb"); |
// if (handle == NULL) |
// return false; |
if (handle == NULL) |
return false; |
// printf("writeFile %s, &s, %d \n\r", name, source, length); |
count = write_once(name, source, length); |
// printf("%d \n\r", count); |
// count = fwrite (source, 1, length, handle); |
// fclose (handle); |
fclose (handle); |
if (count < length) |
return false; |
/programs/games/doom/trunk/m_menu.c |
---|
512,7 → 512,7 |
for (i = 0;i < load_end;i++) |
{ |
sprintf(name,"doomsav%d.dsg",i); |
sprintf(name,SAVEGAMENAME"%d.dsg",i); |
handle = fopen (name, "r"); |
if (handle == NULL) |
572,11 → 572,10 |
{ |
char name[256]; |
// if (M_CheckParm("-cdrom")) |
// sprintf(name,"c:\\doomdata\\doomsav%d.dsg",choice); |
// else |
sprintf(name,"doomsav%d.dsg",choice); |
if (M_CheckParm("-cdrom")) |
sprintf(name,"c:\\doomdata\\"SAVEGAMENAME"%d.dsg",choice); |
else |
sprintf(name,SAVEGAMENAME"%d.dsg",choice); |
G_LoadGame (name); |
M_ClearMenus (); |
} |
623,7 → 622,6 |
// |
void M_DoSave(int slot) |
{ |
G_SaveGame (slot,savegamestrings[slot]); |
M_ClearMenus (); |