diff options
| author | jacksonmj <jacksonmj@jacksonmj.none> | 2011-01-31 14:05:05 (GMT) |
|---|---|---|
| committer | jacksonmj <jacksonmj@jacksonmj.none> | 2011-01-31 14:05:05 (GMT) |
| commit | 363a3e38f1c5f7be91a060bbc33595d1c3ee9de4 (patch) | |
| tree | 0b68f87d8ee2946f1c24c6eefcd285e95f7a8d36 /src/interface.c | |
| parent | cdd7399cc1c009838970ab5dce60c5ad4c332d46 (diff) | |
| parent | 3babc0586c9b8a0de12962a2cc89c93ea3c7f02f (diff) | |
| download | powder-363a3e38f1c5f7be91a060bbc33595d1c3ee9de4.zip powder-363a3e38f1c5f7be91a060bbc33595d1c3ee9de4.tar.gz | |
Merge branch 'cracker64' into dev
Conflicts:
src/interface.c
src/main.c
Diffstat (limited to 'src/interface.c')
| -rw-r--r-- | src/interface.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/src/interface.c b/src/interface.c index 221f2d5..af607c1 100644 --- a/src/interface.c +++ b/src/interface.c @@ -3840,12 +3840,15 @@ char *console_ui(pixel *vid_buf,char error[255]) { //TODO: error messages, show clearrect(vid_buf, 0, 0, XRES+BARSIZE, 220);//anyway to make it transparent? draw_line(vid_buf, 1, 219, XRES, 219, 228, 228, 228, XRES+BARSIZE); - drawtext(vid_buf, 15, 15, "Welcome to The Powder Toy console v.1 (by cracker64)\n" - "Current commands are quit, set, reset, load\n" + drawtext(vid_buf, 100, 15, "Welcome to The Powder Toy console v.2 (by cracker64)\n" + "Current commands are quit, set, reset, load, create, file\n" "You can set type, temp, ctype, life, x, y, vx, vy using this format ('set life particle# 9001')\n" - "You can also use 'all' instead of a particle number to do it to everything\n" + "You can also use 'all' instead of a particle number to do it to everything.\n" + "You can now use particle names (ex. set type all deut)\n" "Reset works with pressure, velocity, sparks, temp (ex. 'reset pressure')\n" - "To load a save use load saveID (ex. load 1337)" + "To load a save use load saveID (ex. load 1337)\n" + "Create particles with 'create deut x y' where x and y are the coords\n" + "Run scripts from file 'file filename'" ,255, 187, 187, 255); cc = 0; @@ -3937,9 +3940,10 @@ int console_get_type(char *element) return i; if (strcasecmp(element,"C4")==0) return PT_PLEX; if (strcasecmp(element,"C5")==0) return PT_C5; + if (strcasecmp(element,"NONE")==0) return PT_NONE; for (i=0; i<PT_NUM; i++) { if (strcasecmp(element,ptypes[i].name)==0) return i; } return -1; -} +}
\ No newline at end of file |