diff --git a/programs/games/LaserTank/trunk/LaserTank.cpp b/programs/games/LaserTank/trunk/LaserTank.cpp index 968d5c6f7b..d1f0586eb4 100644 --- a/programs/games/LaserTank/trunk/LaserTank.cpp +++ b/programs/games/LaserTank/trunk/LaserTank.cpp @@ -1,6 +1,6 @@ #include "smalllibc/kosSyst.h" #include "smalllibc/kosFile.h" -#include "smalllibc/sprintf.cpp" +#include "smalllibc/sprintf.h" #include "smalllibc/func.h" #include "render.h" #include "image.h" diff --git a/programs/games/LaserTank/trunk/smalllibc/func.h b/programs/games/LaserTank/trunk/smalllibc/func.h index 3ab4fe6c6b..ed83d4536f 100644 --- a/programs/games/LaserTank/trunk/smalllibc/func.h +++ b/programs/games/LaserTank/trunk/smalllibc/func.h @@ -3,7 +3,7 @@ #include "kosSyst.h" #include "kosFile.h" -#include "mcsmemm.H" +#include "MCSMEMM.H" #include diff --git a/programs/games/LaserTank/trunk/smalllibc/purecall.cpp b/programs/games/LaserTank/trunk/smalllibc/purecall.cpp deleted file mode 100644 index adad04dd74..0000000000 --- a/programs/games/LaserTank/trunk/smalllibc/purecall.cpp +++ /dev/null @@ -1,11 +0,0 @@ -#include "kosSyst.h" -static char pureCallMessage[] = "PURE function call!"; - -// вызов абстрактного метода -int __cdecl _purecall() -{ - rtlDebugOutString( pureCallMessage ); - kos_ExitApp(); - return 0; -} - diff --git a/programs/games/LaserTank/trunk/smalllibc/sprintf.cpp b/programs/games/LaserTank/trunk/smalllibc/sprintf.cpp index dde80e5f2d..849140d0fa 100644 --- a/programs/games/LaserTank/trunk/smalllibc/sprintf.cpp +++ b/programs/games/LaserTank/trunk/smalllibc/sprintf.cpp @@ -1,24 +1,13 @@ #include "kosSyst.h" #include "func.h" #include +#include "sprintf.h" ////////////////////////////////////////////////////////////////////// // // вывод строки на печать. barsuk добавил %f -//#define PREC 2 -//#define HALF 0.499 -#define PREC 6 -#define HALF 0.4999999 -static double double_tab[]={1e0, 1e1, 1e2, 1e3, 1e4, 1e5, 1e6, 1e7, 1e8, 1e9, 1e10, 1e11, 1e12, 1e13, 1e14, 1e15, -1e16, 1e17, 1e18, 1e19, 1e20, 1e21, 1e22, 1e23, 1e24, 1e25, 1e26, 1e27, 1e28, 1e29, 1e30}; - - -// - -static Dword dectab[] = { 1000000000, 100000000, 10000000, 1000000, 100000, - 10000, 1000, 100, 10, 0 }; // void sprintf( char *Str, char* Format, ... ) diff --git a/programs/games/LaserTank/trunk/smalllibc/sprintf.h b/programs/games/LaserTank/trunk/smalllibc/sprintf.h new file mode 100644 index 0000000000..d4b9a3a526 --- /dev/null +++ b/programs/games/LaserTank/trunk/smalllibc/sprintf.h @@ -0,0 +1,15 @@ +#include "kosSyst.h" + +//#define PREC 2 +//#define HALF 0.499 +#define PREC 6 +#define HALF 0.4999999 + +static double double_tab[] = { 1e0, 1e1, 1e2, 1e3, 1e4, 1e5, 1e6, 1e7, 1e8, 1e9, 1e10, 1e11, 1e12, 1e13, 1e14, 1e15, +1e16, 1e17, 1e18, 1e19, 1e20, 1e21, 1e22, 1e23, 1e24, 1e25, 1e26, 1e27, 1e28, 1e29, 1e30 }; + +static Dword dectab[] = { 1000000000, 100000000, 10000000, 1000000, 100000, +10000, 1000, 100, 10, 0 }; + +void sprintf(char *Str, char* Format, ...); +char *ftoa(double d); \ No newline at end of file