Comment: | Migrate more strings |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA3-256: |
0d125c31daf305a4363234402dbf375e |
User & Date: | js on 2025-03-02 19:52:00 |
Other Links: | manifest | tags |
2025-03-03
| ||
23:52 | Migrate more strings check-in: e7b5d33cad user: js tags: trunk | |
00:30 | Rename readme.txt -> README.md and update it check-in: 5570fb456d user: js tags: trunk | |
2025-03-02
| ||
19:52 | Migrate more strings check-in: 0d125c31da user: js tags: trunk | |
14:56 | Clean up enqueueInit check-in: d4f57c85c4 user: js tags: trunk | |
Modified src/Cube.mm from [d73ec16894] to [008a05c64e].
︙ | |||
81 82 83 84 85 86 87 | 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 | - - + + | SDL_SaveBMP(temp, path(buf)); SDL_FreeSurface(temp); }; SDL_FreeSurface(image); }; } |
︙ | |||
211 212 213 214 215 216 217 | 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 | - - + + | exec("servers.cfg"); if (!execfile("config.cfg")) execfile("data/defaults.cfg"); exec("autoexec.cfg"); log("localconnect"); localconnect(); |
︙ |
Modified src/client.mm from [65bd73d8a9] to [72369d5670].
︙ | |||
66 67 68 69 70 71 72 | 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 | - - + + | void newteam(char *name) { c2sinit = false; strn0cpy(player1->team, name, 5); } |
︙ | |||
167 168 169 170 171 172 173 | 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 | - - - - + + + + | void echo(char *text) { conoutf(@"%s", text); } |
︙ | |||
208 209 210 211 212 213 214 | 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 | - + - - + + - + - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + | server_err() { conoutf(@"server network error, disconnecting..."); disconnect(); } int lastupdate = 0, lastping = 0; |
︙ |
Modified src/clientextras.mm from [3d0c884313] to [d11e243f24].
︙ | |||
157 158 159 160 161 162 163 | 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 | - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + | menumanual(0, scorelines.length() + 1, teamscores); }; }; // sendmap/getmap commands, should be replaced by more intuitive map downloading void |
Modified src/clientgame.mm from [8334b2a352] to [e35d803d58].
1 2 3 4 5 6 7 8 9 10 11 12 | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 | - + - + - + - + | // clientgame.cpp: core game related stuff #include "cube.h" int nextmode = 0; // nextmode becomes gamemode after next map load VAR(gamemode, 1, 0, 0); void mode(int n) { addmsg(1, 2, SV_GAMEMODE, nextmode = n); }; |
︙ | |||
216 217 218 219 220 221 222 | 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 | - + - + - - + + - + | respawn() { if (player1->state == CS_DEAD) { player1->attacking = false; if (m_arena) { conoutf(@"waiting for new round to start..."); return; |
︙ | |||
357 358 359 360 361 362 363 | 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 | - - - - - - - + + + + + + + | void jumpn(bool on) { if (!intermission && (player1->jumpnext = on)) respawn(); }; |
︙ | |||
480 481 482 483 484 485 486 | 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 | - + - + + - + + - - - + + + | players.add(NULL); return players[cn] ? players[cn] : (players[cn] = newdynent()); } void initclient() { |
Modified src/clients2c.mm from [e92e9ee6ab] to [0783f692c0].
1 2 3 4 5 6 | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 | - + - + - - + + - + - + - + | // client processing of the incoming network stream #include "cube.h" extern int clientnum; extern bool c2sinit, senditemstoserver; |
︙ | |||
78 79 80 81 82 83 84 | 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 | - + - - - + + + | if (prot != PROTOCOL_VERSION) { conoutf(@"you are using a different game " @"protocol (you: %d, server: %d)", PROTOCOL_VERSION, prot); disconnect(); return; }; |
︙ | |||
156 157 158 159 160 161 162 | 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 | + - - + + - + | setspawn(n, true); break; } case SV_MAPRELOAD: // server requests next map { getint(p); OFString *nextmapalias = [OFString |
︙ |
Modified src/command.mm from [56e5f5018d] to [a0d92d1a92].
1 2 3 4 5 6 7 8 9 | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 | - - - - - - + + + + + + - + - - + + - + - + - + - + | // command.cpp: implements the parsing and execution of a tiny script language // which is largely backwards compatible with the quake console language. #include "cube.h" enum { ID_VAR, ID_COMMAND, ID_ALIAS }; @interface Ident : OFObject @property (nonatomic) int type; // one of ID_* above |
︙ | |||
105 106 107 108 109 110 111 | 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 | - - + + - - - + + - - + - + | identexists(char *name) { @autoreleasepool { return (idents[@(name)] != nil); } } |
︙ | |||
202 203 204 205 206 207 208 | 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 | - + | if (ID != nil) { switch (ID.type) { case ID_VAR: string t; itoa(t, *(ID.storage)); return exchangestr(n, t); case ID_ALIAS: |
︙ | |||
294 295 296 297 298 299 300 | 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 | - + | ATOI(w[4])); break; case ARG_NONE: if (isdown) ((void(__cdecl *)()) ID.fun)(); break; |
︙ | |||
381 382 383 384 385 386 387 388 389 390 391 392 393 394 | 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 | + + + + + + + + + + + | strcat_s( r, " "); } ((void(__cdecl *)( char *))ID.fun)(r); break; } case ARG_1STR: if (isdown) { @autoreleasepool { ((void( __cdecl *)( OFString *)) ID.fun)( @(w[1])); } } break; } break; // game defined variables case ID_VAR: if (isdown) { if (!w[1][0]) |
︙ | |||
474 475 476 477 478 479 480 | 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 | - + + | // (global) arg values so // functions can access them sprintf_sd(t)("arg%d", i); alias(t, w[i]); } // create new string here because alias // could rebind itself |
︙ | |||
515 516 517 518 519 520 521 | 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 | - + - + | if (!completesize) { completesize = (int)strlen(s) - 1; completeidx = 0; } __block int idx = 0; [idents enumerateKeysAndObjectsUsingBlock:^( OFString *name, Ident *ident, bool *stop) { |
︙ | |||
561 562 563 564 565 566 567 | 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 | - + + - - - + + + + - + | "settings\n// modify settings in game, or put settings in " "autoexec.cfg to override anything\n\n"); writeclientinfo(f); fprintf(f, "\n"); [idents enumerateKeysAndObjectsUsingBlock:^( OFString *name, Ident *ident, bool *stop) { if (ident.type == ID_VAR && ident.persist) { |
︙ | |||
658 659 660 661 662 663 664 | 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 690 691 692 693 694 695 696 697 698 699 700 701 702 703 704 705 706 707 708 709 710 711 712 713 714 715 716 717 718 719 720 721 722 723 724 725 726 727 728 729 730 731 732 733 734 735 736 737 738 739 740 741 742 743 744 745 746 747 748 749 750 751 752 753 754 755 756 757 758 759 760 761 762 | - - - - - - - - - + + + + + + + + + - + + - + + - + + - + + - + + - + + - + + - + - + - + - + | { int n = atoi(pos); loopi(n) s += strspn(s += strcspn(s, " \0"), " "); s[strcspn(s, " \0")] = 0; concat(s); } |
Modified src/console.mm from [74e953a174] to [e55e1dd6f3].
︙ | |||
18 19 20 21 22 23 24 | 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 | - - - + + | void setconskip(int n) { conskip += n; if (conskip < 0) conskip = 0; |
︙ | |||
96 97 98 99 100 101 102 | 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 | - - - + + - - - + + - - - - + + + + | void keymap(char *code, char *key, char *action) { keyms[numkm].code = atoi(code); keyms[numkm].name = newstring(key); keyms[numkm++].action = newstringbuf(action); |
︙ | |||
194 195 196 197 198 199 200 | 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 | - - - + + | { static bool rec = false; if (!rec && n >= 0 && n < vhistory.length()) { rec = true; execute(vhistory[vhistory.length() - n - 1]); rec = false; }; |
︙ |
Modified src/cube.h from [d8a1a5267e] to [6a3965a96d].
︙ | |||
375 376 377 378 379 380 381 | 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 | - + - + + - + | enum // function signatures for script functions, see command.cpp { ARG_1INT, ARG_2INT, ARG_3INT, ARG_4INT, ARG_NONE, |
︙ |
Modified src/editing.mm from [35e47e0fb8] to [90f4cefa84].
︙ | |||
61 62 63 64 65 66 67 | 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 | - - - + + | monsterclear(); // all monsters back at their spawns for // editing projreset(); }; keyrepeat(editmode); selset = false; editing = editmode; |
︙ | |||
351 352 353 354 355 356 357 | 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 | - - - + + | void editheight(int flr, int amount) { EDITSEL; bool isfloor = flr == 0; editheightxy(isfloor, amount, sel); addmsg(1, 7, SV_EDITH, sel.x, sel.y, sel.xs, sel.ys, isfloor, amount); |
︙ | |||
447 448 449 450 451 452 453 | 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 | + + - + + + - + - - + - - - + | addmsg(1, 6, SV_EDITS, sel.x, sel.y, sel.xs, sel.ys, type); }; void heightfield(int t) { edittype(t == 0 ? FHF : CHF); } COMMAND(heightfield, ARG_1INT) |
︙ | |||
490 491 492 493 494 495 496 | 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 | - - - + + | void equalize(int flr) { bool isfloor = flr == 0; EDITSEL; editequalisexy(isfloor, sel); addmsg(1, 6, SV_EDITE, sel.x, sel.y, sel.xs, sel.ys, isfloor); |
︙ | |||
598 599 600 601 602 603 604 | 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 | - - - - - - - - - - - - - + + + + + + + + + + + + + | newent(char *what, char *a1, char *a2, char *a3, char *a4) { EDITSEL; newentity(sel.x, sel.y, (int)player1->o.z, what, ATOI(a1), ATOI(a2), ATOI(a3), ATOI(a4)); }; |
Modified src/init.mm from [79aa5cd4bd] to [1613c5c115].
1 2 3 4 5 | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 | - + - - + + - + - + - + | #include <vector> #import "cube.h" #import "protos.h" |
Modified src/menus.mm from [ae67c88d5e] to [f8da5ecd7e].
︙ | |||
123 124 125 126 127 128 129 | 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 | - - - - - + + + + + | void menuitem(char *text, char *action) { gmenu &menu = menus.last(); mitem &mi = menu.items.add(); mi.text = newstring(text); mi.action = action[0] ? newstring(action) : mi.text; |
︙ |
Modified src/protos.h from [9cae557fce] to [caa998f8bf].
1 2 3 4 5 6 7 8 | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 | - + - + | // protos for ALL external functions in cube... // command extern int variable(char *name, int min, int cur, int max, int *storage, void (*fun)(), bool persist); extern void setvar(char *name, int i); extern int getvar(char *name); extern bool identexists(char *name); |
︙ | |||
86 87 88 89 90 91 92 | 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 | - + - + | extern void changemapserv(char *name, int mode); extern void writeclientinfo(FILE *f); // clientgame extern void mousemove(int dx, int dy); extern void updateworld(int millis); extern void startmap(char *name); |
︙ | |||
178 179 180 181 182 183 184 | 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 | - + - + | // renderparticles extern void setorient(vec &r, vec &u); extern void particle_splash(int type, int num, int fade, vec &p); extern void particle_trail(int type, int fade, vec &from, vec &to); extern void render_particles(int time); // worldio |
︙ |
Modified src/rendercubes.mm from [93318b77b9] to [00e0652146].
︙ | |||
62 63 64 65 66 67 68 | 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 | + + - + - - + - | int firstindex; bool showm = false; void showmip() { showm = !showm; } COMMAND(showmip, ARG_NONE) |
︙ |
Modified src/renderextras.mm from [93b4bffbbf] to [92e074465e].
︙ | |||
209 210 211 212 213 214 215 | 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 | - - - + + | { sprintf_sd(name)("packages/%s_%s.jpg", basename, side[i]); int xs, ys; if (!installtex(texnum + i, path(name), xs, ys, true)) conoutf(@"could not load sky textures"); }; strcpy_s(lastsky, basename); |
︙ |
Modified src/rendergl.mm from [a9494ec649] to [d502cbc841].
︙ | |||
142 143 144 145 146 147 148 | 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 | - + + - - + - - + | int curtexnum = 0; void texturereset() { curtexnum = 0; |
︙ |
Modified src/rendermd2.mm from [e791a84317] to [8c996c1951].
︙ | |||
242 243 244 245 246 247 248 | 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 | - + + - + + - - + - - | mapmodel(char *rad, char *h, char *zoff, char *snap, char *name) { md2 *m = loadmodel(name); mapmodelinfo mmi = { atoi(rad), atoi(h), atoi(zoff), atoi(snap), m->loadname}; m->mmi = mmi; mapmodels.add(m); |
︙ |
Modified src/savegamedemo.mm from [7d18bd49dc] to [173411f8b2].
︙ | |||
18 19 20 21 22 23 24 | 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 | + - + + - + - + + - + + - + + - + - + - + - + + - + + | void startdemo(); void gzput(int i) { gzputc(f, i); } |
︙ | |||
119 120 121 122 123 124 125 126 127 128 129 130 131 132 | 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 | + | return; } sprintf_sd(fn)("savegames/%s.csgz", name); savestate(fn); stop(); conoutf(@"wrote %s", fn); } COMMAND(savegame, ARG_1CSTR) void loadstate(char *fn) { stop(); if (multiplayer()) return; |
︙ | |||
144 145 146 147 148 149 150 | 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 | + + - - + + + + | goto out; // not supporting save->load accross incompatible // architectures simpifies things a LOT if (gzgeti() != SAVEGAMEVERSION || gzgeti() != sizeof(dynent)) goto out; string mapname; gzread(f, mapname, _MAXDEFSTR); nextmode = gzgeti(); @autoreleasepool { changemap( |
︙ | |||
243 244 245 246 247 248 249 | 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 | - + + | sprintf_sd(fn)("demos/%s.cdgz", name); savestate(fn); gzputi(cn); conoutf(@"started recording demo to %s", fn); demorecording = true; starttime = lastmillis; ddamage = bdamage = 0; |
︙ | |||
295 296 297 298 299 300 301 302 303 304 305 306 307 308 | 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 | + | void demo(char *name) { sprintf_sd(fn)("demos/%s.cdgz", name); loadstate(fn); demoloading = true; } COMMAND(demo, ARG_1CSTR) void stopreset() { conoutf(@"demo stopped (%d msec elapsed)", lastmillis - starttime); stop(); loopv(players) zapdynent(players[i]); |
︙ | |||
484 485 486 487 488 489 490 | 498 499 500 501 502 503 504 505 506 | - - + - - - + - - - | stopn() { if (demoplayback) stopreset(); else stop(); conoutf(@"demo stopped"); |
Modified src/serverbrowser.mm from [164c8571dd] to [28e1977716].
︙ | |||
308 309 310 311 312 313 314 | 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 | - - - - - + + + + + | strstr((char *)reply, "<HTML>")) conoutf(@"master server not replying"); else { servers.setsize(0); execute((char *)reply); }; servermenu(); |
︙ |
Modified src/sound.mm from [1b753dcafe] to [45fff0426a].
︙ | |||
106 107 108 109 110 111 112 | 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 | - - - + + + - + | FSOUND_SetPaused(chan, false); }; } else { conoutf(@"could not play music: %s", sn); }; #endif }; |
︙ | |||
263 264 265 266 267 268 269 | 263 264 265 266 267 268 269 270 271 | - - + + | #endif }; void sound(int n) { playsound(n, NULL); |
Modified src/tools.h from [900cc870ab] to [2f2caef516].
︙ | |||
162 163 164 165 166 167 168 | 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 | - + + - + + - + + - + - + - + | pool(); ~pool() { dealloc_block(blocks); }; void *alloc(size_t size); void dealloc(void *p, size_t size); void *realloc(void *p, size_t oldsize, size_t newsize); |
︙ | |||
375 376 377 378 379 380 381 | 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 | - + + - + - + + - + - + - - + + | ht->enumc = ht->enumc->next) \ { \ t e = &ht->enumc->data; \ b; \ } inline char * |
Modified src/tools.mm from [d4bb43600a] to [bc3e2d9f84].
︙ | |||
78 79 80 81 82 83 84 | 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 | - + - + | *((char **)b) = blocks; blocks = b; p = b + PTRSIZE; left = allocsize; }; char * |
︙ |
Modified src/weapon.mm from [2770740083] to [61c62f225e].
︙ | |||
60 61 62 63 64 65 66 | 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 | - - - + + | }; void weapon(char *a1, char *a2, char *a3) { selectgun(a1[0] ? atoi(a1) : -1, a2[0] ? atoi(a2) : -1, a3[0] ? atoi(a3) : -1); |
︙ |
Modified src/world.mm from [0157413baa] to [a8778ab451].
︙ | |||
62 63 64 65 66 67 68 | 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 | - - - + + | if (!savegame && type != 3) playsound(S_RUMBLE); sprintf_sd(aliasname)("level_trigger_%d", tag); if (identexists(aliasname)) execute(aliasname); if (type == 2) endsp(false); |
︙ | |||
356 357 358 359 360 361 362 | 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 | - - - + + | { entity &e = ents[i]; if (e.type == type) e.type = NOTUSED; }; if (type == LIGHT) calclight(); |
︙ | |||
389 390 391 392 393 394 395 | 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 | - - - + + | if (intens) { scalecomp(e.attr2, intens); scalecomp(e.attr3, intens); scalecomp(e.attr4, intens); }; }; calclight(); |
︙ | |||
500 501 502 503 504 505 506 | 497 498 499 500 501 502 503 504 505 506 507 508 | - - - - - + + + + + | }; void newmap(int i) { empty_world(i, false); }; |
Modified src/worldio.mm from [e1e98ece3c] to [6ed752d022].
1 2 3 4 5 6 7 8 9 10 11 12 13 | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 | - - + + - + - + - + | // worldio.cpp: loading & saving of maps and savegames #include "cube.h" void backup(char *name, char *backupname) { remove(backupname); rename(name, backupname); }; string cgzname, bakname, pcfname, mcfname; |
︙ | |||
133 134 135 136 137 138 139 | 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 | - + - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + - - - - - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + | }; fwrite(mdata, 1, msize, f); fclose(f); conoutf(@"wrote map %s as file %s", mname, cgzname); } uchar * |
︙ | |||
367 368 369 370 371 372 373 | 370 371 372 373 374 375 376 377 378 379 | - - - + + + | "level_trigger_%d", l); // can this be done smarter? if (identexists(aliasname)) alias(aliasname, ""); }; execfile("data/default_map_settings.cfg"); execfile(pcfname); execfile(mcfname); |
Modified src/worldocull.mm from [cfc9b27041] to [70fd16d6e2].
︙ | |||
8 9 10 11 12 13 14 | 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 | - - - + + | bool ocull = true; float odist = 256; void toggleocull() { ocull = !ocull; |
︙ |