forks
/
arsd
mirror of https://github.com/adamdruppe/arsd.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

minor tweaks to old code

This commit is contained in:
Adam D. Ruppe 2022-04-05 16:32:54 -04:00
parent a2d1e5df2d
commit d4ac2707c6
2 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
audio.d
View File

@ -4,8 +4,6 @@ module arsd.audio;
import sdl.SDL; import sdl.SDL;
import sdl.SDL_mixer; import sdl.SDL_mixer;
import std.string;
import arsd.engine; import arsd.engine;
bool audioIsLoaded; // potential hack material bool audioIsLoaded; // potential hack material
@ -15,7 +13,7 @@ class Sound {
this(char[] filename){ this(char[] filename){
if(!audioIsLoaded) if(!audioIsLoaded)
return; return;
sfx = Mix_LoadWAV(std.string.toStringz(filename)); sfx = Mix_LoadWAV((filename ~ "\0").ptr);
if(sfx is null) if(sfx is null)
throw new Exception(immutableString("Sound load " ~ filename)); throw new Exception(immutableString("Sound load " ~ filename));
} }
@ -45,7 +43,7 @@ class Music {
this(char[] filename){ this(char[] filename){
if(!audioIsLoaded) if(!audioIsLoaded)
return; return;
mus = Mix_LoadMUS(std.string.toStringz(filename)); mus = Mix_LoadMUS((filename~"\0").ptr);
if(mus is null) if(mus is null)
throw new Exception(immutableString("Music load " ~ filename)); throw new Exception(immutableString("Music load " ~ filename));
} }

19
engine.d
View File

@ -21,13 +21,13 @@ pragma(lib, "GL");
import sdl.SDL; import sdl.SDL;
import sdl.SDL_net; import sdl.SDL_net;
import std.string;
version(D_Version2) { version(D_Version2) {
import random = core.stdc.stdlib; import random = core.stdc.stdlib;
alias random.srand srand; alias random.srand srand;
import std.conv; char[] convToString(int a) {
char[] convToString(T)(T t) { return to!(char[])(t); } return null;
}
string immutableString(in char[] a) { return a.idup; } string immutableString(in char[] a) { return a.idup; }
} else { } else {
import random = std.random; import random = std.random;
@ -49,7 +49,12 @@ version(D_Version2)
else else
import std.stdarg; import std.stdarg;
import std.stdio; version(D_Version2) {
import core.stdc.stdio;
void writefln(string s) { printf("%*s", s.length, s.ptr); }
void writefln(string s, int i) { printf(s.ptr, i); }
} else
import std.stdio;
//version(linux) pragma(lib, "kbhit.o"); //version(linux) pragma(lib, "kbhit.o");
int randomNumber(int min, int max){ int randomNumber(int min, int max){
@ -317,7 +322,7 @@ class Engine{
IPaddress ip; IPaddress ip;
if(SDLNet_ResolveHost(&ip, std.string.toStringz(whom), NET_PORT) == -1) if(SDLNet_ResolveHost(&ip, (whom~"\0").ptr, NET_PORT) == -1)
throw new Exception("Resolve host"); throw new Exception("Resolve host");
clientsock = SDLNet_TCP_Open(&ip); clientsock = SDLNet_TCP_Open(&ip);
@ -661,7 +666,7 @@ class Engine{
} }
void setTitle(in char[] title){ void setTitle(in char[] title){
SDL_WM_SetCaption(std.string.toStringz(title), null); SDL_WM_SetCaption((title~"\0").ptr, null);
} }
bool buttonWasPressed(Buttons button, int which = 0){ bool buttonWasPressed(Buttons button, int which = 0){
@ -979,7 +984,7 @@ class Engine{
buttonLagQueueEnd[button][which] = 0; buttonLagQueueEnd[button][which] = 0;
} else { } else {
if(when < globalTimer) if(when < globalTimer)
throw new Exception(immutableString("Impossible control timing " ~ convToString(when) ~ " @ " ~ convToString(globalTimer))); throw new Exception(immutableString("Impossible control timing"));// " ~ convToString(when) ~ " @ " ~ convToString(globalTimer)));
buttonsDown[button][which] = type; buttonsDown[button][which] = type;
buttonsChecked[button][which] = false; buttonsChecked[button][which] = false;
} }