Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed txt-converter compilation errors (ASCII again + added missing ers.o to makefile)

Browse Source 
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@5170 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
Komurka 2006-02-03 10:21:56 +00:00
parent 432aefc244
commit 78da77b702
3 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Changelog-Trunk.txt
View File

@ -4,6 +4,9 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO
IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK. EVERYTHING ELSE
GOES INTO TRUNK AND WILL BE MERGED INTO STABLE BY VALARIS AND WIZPUTER. -- VALARIS
2006/02/03
* Fixed txt-converter compilation errors [Komurka]
2006/02/02
* Fixed crash in status_change_timer. For some reason the block type switch was removed. [Valaris]
* Crash fix in npc.c npc_timerevent.

2
src/txt-converter/Makefile
View File

@ -3,7 +3,7 @@ all sql: char-converter login-converter
char-converter: char-converter.o ../common/obj/minicore.o ../common/obj/malloc.o ../common/obj/showmsg.o ../common/obj/strlib.o ../common/obj/mapindex.o ../common/obj/ers.o
$(CC) -o ../../tools/$@ $^ $(LIB_S)
login-converter: login-converter.o ../common/obj/minicore.o ../common/obj/db.o ../common/obj/malloc.o ../common/obj/showmsg.o
login-converter: login-converter.o ../common/obj/minicore.o ../common/obj/db.o ../common/obj/malloc.o ../common/obj/showmsg.o ../common/obj/ers.o
$(CC) -o ../../tools/$@ $^ $(LIB_S)
clean:

14
src/txt-converter/char-converter.c
View File

@ -1,4 +1,4 @@
// (c) eAthena Dev Team - Licensed under GNU GPL
// (c) eAthena Dev Team - Licensed under GNU GPL
// For more information, see LICENCE in the main folder
#include <stdio.h>
@ -105,7 +105,7 @@ int mmo_char_fromstr(char *str, struct mmo_charstatus *p, struct accreg *reg) {
&tmp_int[27], &tmp_int[28], &tmp_int[29],
&tmp_int[30], &tmp_int[31], &tmp_int[32], &tmp_int[33], &tmp_int[34],
tmp_str[1], &tmp_int[35], &tmp_int[36],
tmp_str[2], &tmp_int[37], &tmp_int[38], &tmp_int[39],
tmp_str[2], &tmp_int[37], &tmp_int[38], &tmp_int[39],
&tmp_int[40], &tmp_int[41], &tmp_int[42], &tmp_int[43], &next)) != 47)
{
tmp_int[43] = 0;
@ -124,7 +124,7 @@ int mmo_char_fromstr(char *str, struct mmo_charstatus *p, struct accreg *reg) {
&tmp_int[27], &tmp_int[28], &tmp_int[29],
&tmp_int[30], &tmp_int[31], &tmp_int[32], &tmp_int[33], &tmp_int[34],
tmp_str[1], &tmp_int[35], &tmp_int[36], //
tmp_str[2], &tmp_int[37], &tmp_int[38], &tmp_int[39],
tmp_str[2], &tmp_int[37], &tmp_int[38], &tmp_int[39],
&tmp_int[40], &tmp_int[41], &tmp_int[42], &next)) != 46)
{
tmp_int[40] = 0; // father
@ -270,7 +270,7 @@ int mmo_char_fromstr(char *str, struct mmo_charstatus *p, struct accreg *reg) {
}
if (str[next] == '\n' || str[next] == '\r')
return 1; // V‹Kƒf[ƒ^
return 1;
next++;
@ -359,7 +359,7 @@ int mmo_char_fromstr(char *str, struct mmo_charstatus *p, struct accreg *reg) {
next++;
for(i = 0; str[next] && str[next] != '\t' && str[next] != '\n' && str[next] != '\r'; i++) { // global_regŽÀ‘•ˆÈ‘O‚Ìathena.txtŒÝŠ·‚Ì‚½‚߈ꉞ'\n'ƒ`ƒFƒbƒN
for(i = 0; str[next] && str[next] != '\t' && str[next] != '\n' && str[next] != '\r'; i++) {
if (sscanf(str + next, "%[^,],%s%n", reg->reg[i].str, reg->reg[i].value, &len) != 2) {
// because some scripts are not correct, the str can be "". So, we must check that.
// If it's, we must not refuse the character, but just this REG value.
@ -441,7 +441,7 @@ int parse_friend_txt(struct mmo_charstatus *p)
// Note: Remember to keep this function updated with the one in src/char_sql/char.c [Skotlex]
// Unneded code was left commented for easier merging of changes.
// Function by [Ilpalazzo-sama]
int memitemdata_to_sql(struct itemtmp mapitem[], int count, int char_id, int tableswitch)
{
int i; //, flag, id;
@ -861,7 +861,7 @@ int mmo_char_tosql(int char_id, struct mmo_charstatus *p){
if(mysql_query(&mysql_handle, tmp_sql)){
ShowSQL("DB Error (delete friend): %s\n", mysql_error(&mysql_handle));
}
tmp_ptr = tmp_sql;
tmp_ptr += sprintf(tmp_ptr, "INSERT INTO `%s` (`char_id`, `friend_id`) VALUES ", friend_db);
count = 0;