diff -Nur freesci-0.6.4/src/config.l freesci-0.6.4_beos/src/config.l
|
old
|
new
|
|
| 59 | 59 | void *(*check_driver)(char *name); |
| 60 | 60 | } freesci_subsystems[FREESCI_DRIVER_SUBSYSTEMS_NR] = { |
| 61 | 61 | {"gfx", NULL}, |
| 62 | | #ifdef __GNUC__ |
| 63 | | #warning "sound" |
| 64 | | #endif |
| 65 | 62 | #if 0 |
| 66 | 63 | {"pcm", parse_pcmout_driver}, |
| 67 | 64 | {"midiout", parse_midiout_driver} |
| … |
… |
|
| 261 | 258 | OPT_INT("alpha_threshold", alpha_threshold, 0, 255), |
| 262 | 259 | OPT_INT("animation_delay", animation_delay, 0, 1000000), |
| 263 | 260 | OPT_INT("animation_granularity", animation_granularity, 1, 160), |
| 264 | | #ifdef __GNUC__ |
| 265 | | #warning "Re-enable sound server config" |
| 266 | | #endif |
| 267 | 261 | #if 0 |
| 268 | 262 | OPT_STATICREF("midiout_driver", midiout_driver, parse_midiout_driver), |
| 269 | 263 | OPT_STATICREF("midi_device", midi_device, parse_midi_device), |
| … |
… |
|
| 613 | 607 | |
| 614 | 608 | conf->gfx_driver_name = NULL; |
| 615 | 609 | |
| 616 | | #ifdef __GNUC__ |
| 617 | | #warning "Re-enable sound stuff" |
| 618 | | #endif |
| 619 | 610 | #if 0 |
| 620 | 611 | conf->pcmout_driver = pcmout_find_driver(NULL); |
| 621 | 612 | conf->pcmout_rate = 22050; |
| … |
… |
|
| 809 | 800 | } |
| 810 | 801 | |
| 811 | 802 | |
| 812 | | #ifdef __GNUC__ |
| 813 | | #warning "Re-enable sound stuff" |
| 814 | | #endif |
| 815 | 803 | #if 0 |
| 816 | 804 | void * |
| 817 | 805 | parse_sound_server(char *driver_name) |
diff -Nur freesci-0.6.4/src/engine/game.c freesci-0.6.4_beos/src/engine/game.c
|
old
|
new
|
|
| 666 | 666 | int |
| 667 | 667 | game_init(state_t *s) |
| 668 | 668 | { |
| 669 | | #ifdef __GNUC__ |
| 670 | | # warning "Fixme: Use new VM instantiation code all over the place" |
| 671 | | #endif |
| 672 | 669 | reg_t game_obj; /* Address of the game object */ |
| 673 | 670 | dstack_t *stack; |
| 674 | 671 | |
| … |
… |
|
| 769 | 766 | |
| 770 | 767 | sciprintf("Freeing miscellaneous data...\n"); |
| 771 | 768 | |
| 772 | | #ifdef __GNUC__ |
| 773 | | #warning "Free parser segment here" |
| 774 | | #endif |
| 775 | 769 | if (send_calls_allocated) { |
| 776 | 770 | sci_free(send_calls); |
| 777 | 771 | send_calls_allocated = 0; |
| 778 | 772 | } |
| 779 | 773 | |
| 780 | | #ifdef __GNUC__ |
| 781 | | #warning "Free scripts here" |
| 782 | | #endif |
| 783 | 774 | |
| 784 | 775 | menubar_free(s->menubar); |
| 785 | 776 | |
diff -Nur freesci-0.6.4/src/engine/scriptdebug.c freesci-0.6.4_beos/src/engine/scriptdebug.c
|
old
|
new
|
|
| 799 | 799 | return 0; |
| 800 | 800 | } |
| 801 | 801 | |
| 802 | | #ifdef __GNUC__ |
| 803 | | #warning "Re-implement con:so" |
| 804 | | #endif |
| 805 | 802 | #if 0 |
| 806 | 803 | int |
| 807 | 804 | c_stepover(state_t *s) |
| … |
… |
|
| 2279 | 2276 | static int |
| 2280 | 2277 | c_gfx_draw_viewobj(state_t *s) |
| 2281 | 2278 | { |
| 2282 | | #ifdef __GNUC__ |
| 2283 | | #warning "Re-implement con:gfx_draw_viewobj" |
| 2284 | | #endif |
| 2285 | 2279 | #if 0 |
| 2286 | 2280 | heap_ptr pos = (heap_ptr) (cmd_params[0].val); |
| 2287 | 2281 | int is_view; |
| … |
… |
|
| 2918 | 2912 | bb = GET_SELECTOR(pos, bb); |
| 2919 | 2913 | |
| 2920 | 2914 | #if 0 |
| 2921 | | #ifdef __GNUC__ |
| 2922 | | #warning "Re-implement viewobjinfo" |
| 2923 | | #endif |
| 2924 | 2915 | static void |
| 2925 | 2916 | viewobjinfo(state_t *s, heap_ptr pos) |
| 2926 | 2917 | { |
| … |
… |
|
| 3524 | 3515 | con_hook_command(c_vmvarlist, "vmvarlist", "!", "Displays the addresses of variables in the VM"); |
| 3525 | 3516 | con_hook_command(c_step, "s", "i*", "Executes one or several operations\n\nEXAMPLES\n\n" |
| 3526 | 3517 | " s 4\n\n Execute 4 commands\n\n s\n\n Execute next command"); |
| 3527 | | #ifdef __GNUC__ |
| 3528 | | #warning "Re-enable con:so hook" |
| 3529 | | #endif |
| 3530 | 3518 | #if 0 |
| 3531 | 3519 | con_hook_command(c_stepover, "so", "", "Executes one operation skipping over sends"); |
| 3532 | 3520 | #endif |
| … |
… |
|
| 3669 | 3657 | con_hook_command(c_gfx_update_zone, "gfx_update_zone", "iiii", "Propagates a rectangular area from\n the back buffer to the front buffer" |
| 3670 | 3658 | "\n\nUSAGE\n\n" |
| 3671 | 3659 | " gfx_update_zone <x> <y> <xl> <yl>"); |
| 3672 | | #ifdef __GNUC__ |
| 3673 | | #warning "Re-enable con:draw_viewobj" |
| 3674 | | #endif |
| 3675 | 3660 | #if 0 |
| 3676 | 3661 | con_hook_command(c_gfx_draw_viewobj, "draw_viewobj", "i", "Draws the nsRect and brRect of a\n dynview object.\n\n nsRect is green, brRect\n" |
| 3677 | 3662 | " is blue.\n"); |
diff -Nur freesci-0.6.4/src/include/kernel_compat.h freesci-0.6.4_beos/src/include/kernel_compat.h
|
old
|
new
|
|
| 29 | 29 | #ifndef _SCI_KERNEL_COMPAT_ |
| 30 | 30 | #define _SCI_KERNEL_COMPAT_ |
| 31 | 31 | |
| 32 | | #ifdef __GNUC__ |
| 33 | | #warning "Old kernel compatibility crap" |
| 34 | | #endif |
| 35 | 32 | |
| 36 | 33 | /* Minimal heap position */ |
| 37 | 34 | #define HEAP_MIN 800 |
diff -Nur freesci-0.6.4/src/include/sci_conf.h freesci-0.6.4_beos/src/include/sci_conf.h
|
old
|
new
|
|
| 85 | 85 | int reverse_stereo; |
| 86 | 86 | int res_version; |
| 87 | 87 | |
| 88 | | #ifdef __GNUC__ |
| 89 | | # warning "Re-enable sound stuff" |
| 90 | | #endif |
| 91 | 88 | #if 0 |
| 92 | 89 | midiout_driver_t *midiout_driver; /* the midiout method to use */ |
| 93 | 90 | midi_device_t *midi_device; /* the midi device to use */ |
diff -Nur freesci-0.6.4/src/main.c freesci-0.6.4_beos/src/main.c
|
old
|
new
|
|
| 308 | 308 | printf("\n"); |
| 309 | 309 | } |
| 310 | 310 | |
| 311 | | #ifdef __GNUC__ |
| 312 | | #warning "Re-enable sound stuff" |
| 313 | | #endif |
| 314 | 311 | #if 0 |
| 315 | 312 | static void |
| 316 | 313 | list_pcmout_drivers() |
| … |
… |
|
| 549 | 546 | printf("Supported graphics drivers: "); |
| 550 | 547 | list_graphics_drivers(); |
| 551 | 548 | |
| 552 | | #ifdef __GNUC__ |
| 553 | | #warning "Re-enable sound stuff" |
| 554 | | #endif |
| 555 | 549 | #if 0 |
| 556 | 550 | printf("Supported sound servers: "); |
| 557 | 551 | list_sound_servers(); |
| … |
… |
|
| 1115 | 1109 | |
| 1116 | 1110 | chdir(startdir); |
| 1117 | 1111 | |
| 1118 | | #ifdef __GNUC__ |
| 1119 | | #warning "sound" |
| 1120 | | #endif |
| 1121 | 1112 | #if 0 |
| 1122 | 1113 | printf("Mapping instruments to General Midi\n"); |
| 1123 | 1114 | |
| … |
… |
|
| 1171 | 1162 | free(cl_options.gfx_driver_name); |
| 1172 | 1163 | } /* else it's still NULL */ |
| 1173 | 1164 | |
| 1174 | | #ifdef __GNUC__ |
| 1175 | | #warning "sound" |
| 1176 | | #endif |
| 1177 | 1165 | #if 0 |
| 1178 | 1166 | if (cl_options.pcmout_driver_name) |
| 1179 | 1167 | pcmout_driver = old_lookup_driver((old_lookup_funct_t *)pcmout_find_driver, |
| … |
… |
|
| 1209 | 1197 | memcpy(gfx_options, &(active_conf->gfx_options), sizeof(gfx_options_t)); /* memcpy so that console works */ |
| 1210 | 1198 | if (!gfx_driver_name) |
| 1211 | 1199 | gfx_driver_name = active_conf->gfx_driver_name; |
| 1212 | | #ifdef __GNUC__ |
| 1213 | | #warning "sound" |
| 1214 | | #endif |
| 1215 | 1200 | #if 0 |
| 1216 | 1201 | if (!sound_server) |
| 1217 | 1202 | sound_server = active_conf->sound_server; |
| … |
… |
|
| 1297 | 1282 | } |
| 1298 | 1283 | } |
| 1299 | 1284 | |
| 1300 | | #ifdef __GNUC__ |
| 1301 | | #warning "sound" |
| 1302 | | #endif |
| 1303 | 1285 | #if 0 |
| 1304 | 1286 | /* Configure the pcmout driver */ |
| 1305 | 1287 | { |
| … |
… |
|
| 1349 | 1331 | exit(1); |
| 1350 | 1332 | } |
| 1351 | 1333 | |
| 1352 | | #ifdef __GNUC__ |
| 1353 | | #warning "sound" |
| 1354 | | #endif |
| 1355 | 1334 | #if 0 |
| 1356 | 1335 | if (!sound_server) |
| 1357 | 1336 | sound_server = sound_server_find_driver(NULL); |
| … |
… |
|
| 1360 | 1339 | if (cl_options.show_rooms) |
| 1361 | 1340 | set_debug_mode(gamestate, 1, "r"); |
| 1362 | 1341 | |
| 1363 | | #ifdef __GNUC__ |
| 1364 | | #warning "sound" |
| 1365 | | #endif |
| 1366 | 1342 | #if 0 |
| 1367 | 1343 | gamestate->sound_server = sound_server; |
| 1368 | 1344 | |
| … |
… |
|
| 1405 | 1381 | |
| 1406 | 1382 | printf("Graphics: Using the %s driver %s\n", |
| 1407 | 1383 | gfx_driver->name, gfx_driver->version); |
| 1408 | | #ifdef __GNUC__ |
| 1409 | | #warning "sound" |
| 1410 | | #endif |
| 1411 | 1384 | #if 0 |
| 1412 | 1385 | printf("MIDI-out: Using the %s driver %s\n", |
| 1413 | 1386 | midiout_driver->name, midiout_driver->version); |
| … |
… |
|
| 1430 | 1403 | game_restore(&gamestate, savegame_name); |
| 1431 | 1404 | else |
| 1432 | 1405 | game_run(&gamestate); /* Run the game */ |
| 1433 | | #ifdef __GNUC__ |
| 1434 | | #warning "sound" |
| 1435 | | #endif |
| 1436 | 1406 | #if 0 |
| 1437 | 1407 | if (gamestate->sound_server) |
| 1438 | 1408 | gamestate->sound_server->exit(gamestate); /* Shutdown sound daemon first */ |