Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/kungfooman/libcod
Browse files Browse the repository at this point in the history
  • Loading branch information
M-itch committed Jan 16, 2015
2 parents 835d8d1 + e74966c commit a126366
Show file tree
Hide file tree
Showing 8 changed files with 687 additions and 713 deletions.
8 changes: 6 additions & 2 deletions gsc.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -135,9 +135,10 @@ void gsc_utils_printf() {
for (int i=0; i<len; i++) {
if (str[i] == '%')
{
if(str[i + 1] == '%')
if(str[i + 1] == '%') {
putchar('%');
else
i++;
} else
stackPrintParam(param++);
}
else
Expand Down Expand Up @@ -246,6 +247,7 @@ Scr_Function scriptFunctions[] = {
{"get_language_item" , gsc_get_language_item , 0},
{"G_FindConfigstringIndex" , gsc_G_FindConfigstringIndex , 0},
{"G_FindConfigstringIndexOriginal", gsc_G_FindConfigstringIndexOriginal , 0},
{"reset_rename" , gsc_reset_rename , 0},
#endif

#if COMPILE_TCC == 1
Expand Down Expand Up @@ -315,6 +317,8 @@ Scr_Method scriptMethods[] = {
{"set_userinfo" , gsc_set_userinfo , 0},
{"printOutOfBand" , gsc_player_outofbandprint , 0},
{"connectionlessPacket" , gsc_player_connectionlesspacket, 0},
{"allow_rename" , gsc_player_allow_rename , 0},
{"clientuserinfochanged" , gsc_player_clientuserinfochanged, 0},
#endif

{NULL, NULL, 0}
Expand Down
Empty file modified gsc_math.cpp
100644 → 100755
Empty file.
Empty file modified gsc_math.hpp
100644 → 100755
Empty file.

0 comments on commit a126366

Please sign in to comment.