Skip to content

Commit

Permalink
Merge pull request #103 from alibayindir/guncel-derleyici-uyumlu
Browse files Browse the repository at this point in the history
gcc-9 veya öncesi derlenebilir kod
  • Loading branch information
ozgyilmaz authored Feb 3, 2020
2 parents 0e7826b + 1e176b4 commit a7785b3
Show file tree
Hide file tree
Showing 12 changed files with 27 additions and 24 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,5 @@ player/.DS_Store
src/.DS_Store
data/.DS_Store
.DS_Store
*.o
uzakdiyarlar
Empty file modified area/haon_dor.are
100755 → 100644
Empty file.
5 changes: 2 additions & 3 deletions src/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,12 @@ O_FILES = act_comm.o act_hera.o act_info.o act_move.o act_obj.o act_wiz.o ban.o
mob_creator.o mob_prog.o obj_prog.o quest.o recycle.o save.o skills.o \
special.o tables.o update.o -lcrypt

anatolia: $(O_FILES)
uzakdiyarlar: $(O_FILES)
rm -f uzakdiyarlar
$(CC) $(L_FLAGS) -o uzakdiyarlar $(O_FILES)

.c.o: merc.h
$(CC) -c $(C_FLAGS) $<

clean:
@rm -f *.o
make
@rm -f *.o uzakdiyarlar
2 changes: 1 addition & 1 deletion src/act_obj.c
Original file line number Diff line number Diff line change
Expand Up @@ -1547,7 +1547,7 @@ void do_envenom(CHAR_DATA *ch, char *argument)
int percent,skill;

/* find out what */
if (argument == '\0')
if (argument == NULL)
{
send_to_char("Neyi zehirleyeceksin?\n\r",ch);
return;
Expand Down
4 changes: 3 additions & 1 deletion src/comm.c
Original file line number Diff line number Diff line change
Expand Up @@ -2166,6 +2166,8 @@ void nanny( DESCRIPTOR_DATA *d, char *argument )

case CON_GET_NEW_RACE:
one_argument(argument,arg);
// ilk denemede string önünde '\376' geliyor, ýrk seçimi hata veriyor. dolaylý çözüm!
if(argument[0]<0) argument++; if(arg[0]<0) memmove(arg, arg+1, strlen(arg));

if (!str_cmp(arg,"yardým"))
{
Expand Down Expand Up @@ -3520,7 +3522,7 @@ int ethos_check(CHAR_DATA *ch)
int colour( char type, CHAR_DATA *ch, char *string )
{
char code[ 20 ];
char *p = '\0';
char *p = NULL;

if( IS_NPC( ch ) )
return( 0 );
Expand Down
Empty file modified src/dilek.c
100755 → 100644
Empty file.
Empty file modified src/ek.c
100755 → 100644
Empty file.
Empty file modified src/ek.h
100755 → 100644
Empty file.
Empty file modified src/ek2.c
100755 → 100644
Empty file.
Empty file modified src/ek2.h
100755 → 100644
Empty file.
2 changes: 1 addition & 1 deletion src/interp.c
Original file line number Diff line number Diff line change
Expand Up @@ -1159,7 +1159,7 @@ void do_unalias(CHAR_DATA *ch, char *argument)

argument = one_argument(argument,arg);

if (arg == '\0')
if (arg == NULL)
{
send_to_char("Hangi kýsayolu kaldýracaksýnýz?\n\r",ch);
return;
Expand Down
36 changes: 18 additions & 18 deletions src/telnet.h
Original file line number Diff line number Diff line change
Expand Up @@ -23,25 +23,25 @@
#ifndef _arpa_telnet_h
#define _arpa_telnet_h

#define IAC 255 /* interpret as command: */
#define DONT 254 /* you are not to use option */
#define DO 253 /* please, you use option */
#define WONT 252 /* I won't use option */
#define WILL 251 /* I will use option */
#define SB 250 /* interpret as subnegotiation */
#define GA 249 /* you may reverse the line */
#define EL 248 /* erase the current line */
#define EC 247 /* erase the current character */
#define AYT 246 /* are you there */
#define AO 245 /* abort output--but let prog finish */
#define IP 244 /* interrupt process--permanently */
#define BREAK 243 /* break */
#define DM 242 /* data mark--for connect. cleaning */
#define NOP 241 /* nop */
#define SE 240 /* end sub negotiation */
#define EOR 239 /* end of record (transparent mode) */
#define IAC '\xFF' /* 255 interpret as command: */
#define DONT '\xFE' /* 254 you are not to use option */
#define DO '\xFD' /* 253 please, you use option */
#define WONT '\xFC' /* 252 I won't use option */
#define WILL '\xFB' /* 251 I will use option */
#define SB '\xFA' /* 250 interpret as subnegotiation */
#define GA '\xF9' /* 249 you may reverse the line */
#define EL '\xF8' /* 248 erase the current line */
#define EC '\xF7' /* 247 erase the current character */
#define AYT '\xF6' /* 246 are you there */
#define AO '\xF5' /* 245 abort output--but let prog finish */
#define IP '\xF4' /* 244 interrupt process--permanently */
#define BREAK '\xF3' /* 243 break */
#define DM '\xF2' /* 242 data mark--for connect. cleaning */
#define NOP '\xF1' /* 241 nop */
#define SE '\xF0' /* 240 end sub negotiation */
#define EOR '\xEF' /* 239 end of record (transparent mode) */

#define SYNCH 242 /* for telfunc calls */
#define SYNCH '\xF2' /* 242 for telfunc calls */

#ifdef TELCMDS
char *telcmds[] = {
Expand Down

0 comments on commit a7785b3

Please sign in to comment.