From f35669c212f193a5594894ad6c4735d28105c5f2 Mon Sep 17 00:00:00 2001 From: Rodolphe Suescun Date: Wed, 15 Feb 2006 09:57:55 +0000 Subject: [PATCH] Fixed problem in data patch 05. Maybe all patches should be merged... Now filenames are case insensitive (will help using maps created with Qamly's EditWorld). git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@396 4a71c877-e1ca-e34f-864e-861f7616d084 --- data/05/addon.lev | 500 ------------------ data/06/addon.lev | 1000 ++++++++++++++++++++++++++++++++++++ lib/framework/Makefile.am | 2 + lib/framework/Makefile.raw | 1 + lib/framework/frame_stub.c | 3 +- lib/framework/ignorecase.c | 218 ++++++++ lib/framework/ignorecase.h | 75 +++ src/revision.h | 2 +- 8 files changed, 1299 insertions(+), 502 deletions(-) delete mode 100644 data/05/addon.lev create mode 100644 lib/framework/ignorecase.c create mode 100644 lib/framework/ignorecase.h diff --git a/data/05/addon.lev b/data/05/addon.lev deleted file mode 100644 index f66dabe04..000000000 --- a/data/05/addon.lev +++ /dev/null @@ -1,500 +0,0 @@ -/********************************************************/ -/********************************************************/ -/* MultiPlayer technology enablers */ -/* alex lee april 99 */ - -/* ************************ */ -/* CAMPAIGN SETS */ -/* tech level 1 */ -/* cam 1 MULTI_CAM_1 */ -/* cam 2 MULTI_CAM_2 */ -/* cam 3 MULTI_CAM_3 */ -/* ************************ */ -/* tech level 2 */ -/* cam 1 MULTI_T2_C1 */ -/* cam 2 MULTI_T2_C2 */ -/* cam 3 MULTI_T2_C3 */ -/* ************************ */ -/* tech level 3 */ -/* cam 1 MULTI_T3_C1 */ -/* cam 2 MULTI_T3_C2 */ -/* cam 3 MULTI_T3_C3 */ -/* ************************ */ - -/* ************************ */ -/* GAMETYPES */ -/* */ -/* CAMPAIGN 12 */ -/* CAMPAIGN RESEARCH 2 15 */ -/* CAMPAIGN RESEARCH 3 16 */ -/* */ -/* SKIRMISH 14 */ -/* SKIRMISH RESEARCH 2 18 */ -/* SKIRMISH RESEARCH 3 19 */ - -/* */ -/* reserved (dont use) */ -/* TEAMPLAY 13 */ -/* DMATCH 11 */ -/* ************************ */ - -/* ************************ */ -/* tech level 3 */ -campaign MULTI_T3_C1 -data "wrf\vidmem.wrf" -data "wrf\basic.wrf" -data "wrf\cam1.wrf" -data "wrf\audio.wrf" -data "wrf\piestats.wrf" -data "wrf\stats.wrf" -data "wrf\multires3.wrf" - -campaign MULTI_T3_C2 -data "wrf\vidmem2.wrf" -data "wrf\basic.wrf" -data "wrf\cam2.wrf" -data "wrf\audio.wrf" -data "wrf\piestats.wrf" -data "wrf\stats.wrf" -data "wrf\multires3.wrf" - -campaign MULTI_T3_C3 -data "wrf\vidmem3.wrf" -data "wrf\basic.wrf" -data "wrf\cam3.wrf" -data "wrf\audio.wrf" -data "wrf\piestats.wrf" -data "wrf\stats.wrf" -data "wrf\multires3.wrf" - -// add definitions for ALL current maps for T3 - -/********************************************************/ -/* standard multiplayer campaigns */ - - -//// 003 NewTech - NO New Maps - -level GreatRift-T3 -players 4 -type 16 -dataset MULTI_T3_C1 -game "multiplay\maps\4c-greatrift.gam" -data "wrf\multi\campaign.wrf" -data "wrf\multi\fog1.wrf" - -level ThePit-T3 -players 8 -type 16 -dataset MULTI_T3_C3 -game "multiplay\maps\8c-ThePit.gam" -data "wrf\multi\campaign.wrf" -data "wrf\multi\fog3.wrf" - -level Rush-T3 -players 4 -type 16 -dataset MULTI_T3_C1 -game "multiplay\maps\4c-Rush.gam" -data "wrf\multi\campaign.wrf" -data "wrf\multi\fog1.wrf" - -level Rush2-T3 -players 4 -type 16 -dataset MULTI_T3_C1 -game "multiplay\maps\4c-Rush2.gam" -data "wrf\multi\campaign.wrf" -data "wrf\multi\fog1.wrf" - -level StartUp-T3 -players 2 -type 16 -dataset MULTI_T3_C1 -game "multiplay\maps\2c-StartUp.gam" -data "wrf\multi\campaign.wrf" -data "wrf\multi\fog1.wrf" - -level MizaMaze-T3 -players 8 -type 16 -dataset MULTI_T3_C1 -game "multiplay\maps\8c-MizaMaze.gam" -data "wrf\multi\campaign.wrf" -data "wrf\multi\fog1.wrf" - -level Clover-T3 -players 8 -type 16 -dataset MULTI_T3_C1 -game "multiplay\maps\8c-Clover.gam" -data "wrf\multi\campaign.wrf" -data "wrf\multi\fog1.wrf" - -level UrbanChasm-T3 -players 2 -type 16 -dataset MULTI_T3_C2 -game "multiplay\maps\2c-UrbanChasm.gam" -data "wrf\multi\campaign.wrf" -data "wrf\multi\fog2.wrf" - -level Urbanduel-T3 -players 4 -type 16 -dataset MULTI_T3_C2 -game "multiplay\maps\4c-UrbanDuel.gam" -data "wrf\multi\campaign.wrf" -data "wrf\multi\fog2.wrf" - -level Manhattan-T3 -players 8 -type 16 -dataset MULTI_T3_C2 -game "multiplay\maps\8c-Manhattan.gam" -data "wrf\multi\campaign.wrf" -data "wrf\multi\fog2.wrf" - -level HighGround-T3 -players 2 -type 16 -dataset MULTI_T3_C3 -game "multiplay\maps\2c-HighGround.gam" -data "wrf\multi\campaign.wrf" -data "wrf\multi\fog3.wrf" - -level Mountain-T3 -players 4 -type 16 -dataset MULTI_T3_C3 -game "multiplay\maps\4c-Mountain.gam" -data "wrf\multi\campaign.wrf" -data "wrf\multi\fog3.wrf" - -level Bananas-T3 -players 8 -type 16 -dataset MULTI_T3_C3 -game "multiplay\maps\8c-Bananas.gam" -data "wrf\multi\campaign.wrf" -data "wrf\multi\fog3.wrf" - -level Wheel-T3 -players 8 -type 16 -dataset MULTI_T3_C3 -game "multiplay\maps\8c-WheelOfFortune.gam" -data "wrf\multi\campaign.wrf" -data "wrf\multi\fog3.wrf" - -level Ziggurat-T3 -players 8 -type 16 -dataset MULTI_T3_C1 -game "multiplay\maps\8c-Ziggurat.gam" -data "wrf\multi\campaign.wrf" -data "wrf\multi\fog1.wrf" - -level Valley-T3 -players 4 -type 16 -dataset MULTI_T3_C3 -game "multiplay\maps\4c-ValleyOfDeath.gam" -data "wrf\multi\campaign.wrf" -data "wrf\multi\fog3.wrf" - -level Concrete-T3 -players 8 -type 16 -dataset MULTI_T3_C2 -game "multiplay\maps\8c-ConcretePlayGround.gam" -data "wrf\multi\campaign.wrf" -data "wrf\multi\fog2.wrf" - -level FishNet-T3 -players 4 -type 16 -dataset MULTI_T3_C3 -game "multiplay\maps\4c-Fishnet.gam" -data "wrf\multi\campaign.wrf" -data "wrf\multi\fog3.wrf" - -//********************************************************/ -//* skirmish tech level 2 */ - -level Sk-Rush-T2 -players 4 -type 18 -dataset MULTI_T2_C1 -game "multiplay\maps\4c-rush.gam" -data "wrf\multi\t2-skirmish4.wrf" -data "wrf\multi\fog1.wrf" - -level Sk-StartUp-T2 -players 2 -type 18 -dataset MULTI_T2_C1 -game "multiplay\maps\2c-StartUp.gam" -data "wrf\multi\t2-skirmish2.wrf" -data "wrf\multi\fog1.wrf" - -level Sk-MizaMaze-T2 -players 8 -type 18 -dataset MULTI_T2_C1 -game "multiplay\maps\8c-mizamaze.gam" -data "wrf\multi\t2-skirmish8.wrf" -data "wrf\multi\fog1.wrf" - -level Sk-Clover-T2 -players 8 -type 18 -dataset MULTI_T2_C1 -game "multiplay\maps\8c-clover.gam" -data "wrf\multi\t2-skirmish8.wrf" -data "wrf\multi\fog1.wrf" - -level Sk-UrbanChasm-T2 -players 2 -type 18 -dataset MULTI_T2_C2 -game "multiplay\maps\2c-urbanchasm.gam" -data "wrf\multi\t2-skirmish2.wrf" -data "wrf\multi\fog2.wrf" - -level Sk-UrbanDuel-T2 -players 4 -type 18 -dataset MULTI_T2_C2 -game "multiplay\maps\4c-urbanduel.gam" -data "wrf\multi\t2-skirmish4.wrf" -data "wrf\multi\fog2.wrf" - -level Sk-Manhattan-T2 -players 8 -type 18 -dataset MULTI_T2_C2 -game "multiplay\maps\8c-manhattan.gam" -data "wrf\multi\t2-skirmish8.wrf" -data "wrf\multi\fog2.wrf" - -level Sk-HighGround-T2 -players 2 -type 18 -dataset MULTI_T2_C3 -game "multiplay\maps\2c-highground.gam" -data "wrf\multi\t2-skirmish2.wrf" -data "wrf\multi\fog3.wrf" - -level Sk-Mountain-T2 -players 4 -type 18 -dataset MULTI_T2_C3 -game "multiplay\maps\4c-mountain.gam" -data "wrf\multi\t2-skirmish4.wrf" -data "wrf\multi\fog3.wrf" - -level Sk-Bananas-T2 -players 8 -type 18 -dataset MULTI_T2_C3 -game "multiplay\maps\8c-bananas.gam" -data "wrf\multi\t2-skirmish8.wrf" -data "wrf\multi\fog3.wrf" - -level Sk-Wheel-T2 -players 8 -type 18 -dataset MULTI_T2_C3 -game "multiplay\maps\8c-WheelOfFortune.gam" -data "wrf\multi\t2-skirmish8.wrf" -data "wrf\multi\fog3.wrf" - -level Sk-Ziggurat-T2 -players 8 -type 18 -dataset MULTI_T2_C1 -game "multiplay\maps\8c-Ziggurat.gam" -data "wrf\multi\t2-skirmish8.wrf" -data "wrf\multi\fog1.wrf" - -level Sk-Valley-T2 -players 4 -type 18 -dataset MULTI_T2_C3 -game "multiplay\maps\4c-ValleyOfDeath.gam" -data "wrf\multi\t2-skirmish4.wrf" -data "wrf\multi\fog3.wrf" - -level Sk-Concrete-T2 -players 8 -type 18 -dataset MULTI_T2_C2 -game "multiplay\maps\8c-ConcretePlayGround.gam" -data "wrf\multi\t2-skirmish8.wrf" -data "wrf\multi\fog2.wrf" - -level Sk-FishNets-T2 -players 4 -type 18 -dataset MULTI_T2_C3 -game "multiplay\maps\4c-Fishnet.gam" -data "wrf\multi\t2-skirmish4.wrf" -data "wrf\multi\fog3.wrf" - -level Sk-GreatRift-T2 -players 4 -type 18 -dataset MULTI_T2_C1 -game "multiplay\maps\4c-greatrift.gam" -data "wrf\multi\t2-skirmish4.wrf" -data "wrf\multi\fog1.wrf" - -level Sk-ThePit-T2 -players 8 -type 18 -dataset MULTI_T2_C3 -game "multiplay\maps\8c-ThePit.gam" -data "wrf\multi\t2-skirmish8.wrf" -data "wrf\multi\fog3.wrf" - - - -//*********************************************************/ -//* skirmish tech level 3 - -level Sk-Rush-T3 -players 4 -type 19 -dataset MULTI_T3_C1 -game "multiplay\maps\4c-rush.gam" -data "wrf\multi\t3-skirmish4.wrf" -data "wrf\multi\fog1.wrf" - -level Sk-StartUp-T3 -players 2 -type 19 -dataset MULTI_T3_C1 -game "multiplay\maps\2c-StartUp.gam" -data "wrf\multi\t3-skirmish2.wrf" -data "wrf\multi\fog1.wrf" - -level Sk-MizaMaze-T3 -players 8 -type 19 -dataset MULTI_T3_C1 -game "multiplay\maps\8c-mizamaze.gam" -data "wrf\multi\t3-skirmish8.wrf" -data "wrf\multi\fog1.wrf" - -level Sk-Clover-T3 -players 8 -type 19 -dataset MULTI_T3_C1 -game "multiplay\maps\8c-clover.gam" -data "wrf\multi\t3-skirmish8.wrf" -data "wrf\multi\fog1.wrf" - -level Sk-UrbanChasm-T3 -players 2 -type 19 -dataset MULTI_T3_C2 -game "multiplay\maps\2c-urbanchasm.gam" -data "wrf\multi\t3-skirmish2.wrf" -data "wrf\multi\fog2.wrf" - -level Sk-UrbanDuel-T3 -players 4 -type 19 -dataset MULTI_T3_C2 -game "multiplay\maps\4c-urbanduel.gam" -data "wrf\multi\t3-skirmish4.wrf" -data "wrf\multi\fog2.wrf" - -level Sk-Manhattan-T3 -players 8 -type 19 -dataset MULTI_T3_C2 -game "multiplay\maps\8c-manhattan.gam" -data "wrf\multi\t3-skirmish8.wrf" -data "wrf\multi\fog2.wrf" - -level Sk-Mountain-T3 -players 4 -type 19 -dataset MULTI_T3_C3 -game "multiplay\maps\4c-mountain.gam" -data "wrf\multi\t3-skirmish4.wrf" -data "wrf\multi\fog3.wrf" - -level Sk-HighGround-T3 -players 2 -type 19 -dataset MULTI_T3_C3 -game "multiplay\maps\2c-highground.gam" -data "wrf\multi\t3-skirmish2.wrf" -data "wrf\multi\fog3.wrf" - -level Sk-Bananas-T3 -players 8 -type 19 -dataset MULTI_T3_C3 -game "multiplay\maps\8c-bananas.gam" -data "wrf\multi\t3-skirmish8.wrf" -data "wrf\multi\fog3.wrf" - -level Sk-Wheel-T3 -players 8 -type 19 -dataset MULTI_T3_C3 -game "multiplay\maps\8c-WheelOfFortune.gam" -data "wrf\multi\t3-skirmish8.wrf" -data "wrf\multi\fog3.wrf" - -level Sk-Ziggurat-T3 -players 8 -type 19 -dataset MULTI_T3_C1 -game "multiplay\maps\8c-Ziggurat.gam" -data "wrf\multi\t3-skirmish8.wrf" -data "wrf\multi\fog1.wrf" - -level Sk-Valley-T3 -players 4 -type 19 -dataset MULTI_T3_C3 -game "multiplay\maps\4c-ValleyOfDeath.gam" -data "wrf\multi\t3-skirmish4.wrf" -data "wrf\multi\fog3.wrf" - -level Sk-Concrete-T3 -players 8 -type 19 -dataset MULTI_T3_C2 -game "multiplay\maps\8c-ConcretePlayGround.gam" -data "wrf\multi\t3-skirmish8.wrf" -data "wrf\multi\fog2.wrf" - -level Sk-FishNets-T3 -players 4 -type 19 -dataset MULTI_T3_C3 -game "multiplay\maps\4c-Fishnet.gam" -data "wrf\multi\t3-skirmish4.wrf" -data "wrf\multi\fog3.wrf" - -level Sk-GreatRift-T3 -players 4 -type 19 -dataset MULTI_T3_C1 -game "multiplay\maps\4c-greatrift.gam" -data "wrf\multi\t3-skirmish4.wrf" -data "wrf\multi\fog1.wrf" - -level Sk-ThePit-T3 -players 8 -type 19 -dataset MULTI_T2_C3 -game "multiplay\maps\8c-ThePit.gam" -data "wrf\multi\t3-skirmish8.wrf" -data "wrf\multi\fog3.wrf" diff --git a/data/06/addon.lev b/data/06/addon.lev index 18ac36b68..4147fd803 100644 --- a/data/06/addon.lev +++ b/data/06/addon.lev @@ -1,3 +1,1003 @@ +/********************************************************/ +/********************************************************/ +/* MultiPlayer technology enablers */ +/* alex lee april 99 */ + +/* ************************ */ +/* CAMPAIGN SETS */ +/* tech level 1 */ +/* cam 1 MULTI_CAM_1 */ +/* cam 2 MULTI_CAM_2 */ +/* cam 3 MULTI_CAM_3 */ +/* ************************ */ +/* tech level 2 */ +/* cam 1 MULTI_T2_C1 */ +/* cam 2 MULTI_T2_C2 */ +/* cam 3 MULTI_T2_C3 */ +/* ************************ */ +/* tech level 3 */ +/* cam 1 MULTI_T3_C1 */ +/* cam 2 MULTI_T3_C2 */ +/* cam 3 MULTI_T3_C3 */ +/* ************************ */ + +/* ************************ */ +/* GAMETYPES */ +/* */ +/* CAMPAIGN 12 */ +/* CAMPAIGN RESEARCH 2 15 */ +/* CAMPAIGN RESEARCH 3 16 */ +/* */ +/* SKIRMISH 14 */ +/* SKIRMISH RESEARCH 2 18 */ +/* SKIRMISH RESEARCH 3 19 */ + +/* */ +/* reserved (dont use) */ +/* TEAMPLAY 13 */ +/* DMATCH 11 */ +/* ************************ */ + +/* ************************ */ +/* tech level 3 */ +campaign MULTI_T3_C1 +data "wrf\vidmem.wrf" +data "wrf\basic.wrf" +data "wrf\cam1.wrf" +data "wrf\audio.wrf" +data "wrf\piestats.wrf" +data "wrf\stats.wrf" +data "wrf\multires3.wrf" + +campaign MULTI_T3_C2 +data "wrf\vidmem2.wrf" +data "wrf\basic.wrf" +data "wrf\cam2.wrf" +data "wrf\audio.wrf" +data "wrf\piestats.wrf" +data "wrf\stats.wrf" +data "wrf\multires3.wrf" + +campaign MULTI_T3_C3 +data "wrf\vidmem3.wrf" +data "wrf\basic.wrf" +data "wrf\cam3.wrf" +data "wrf\audio.wrf" +data "wrf\piestats.wrf" +data "wrf\stats.wrf" +data "wrf\multires3.wrf" + +// add definitions for ALL current maps for T3 + +/********************************************************/ +/* standard multiplayer campaigns */ + + +//// 003 NewTech - NO New Maps + +level GreatRift-T3 +players 4 +type 16 +dataset MULTI_T3_C1 +game "multiplay\maps\4c-greatrift.gam" +data "wrf\multi\campaign.wrf" +data "wrf\multi\fog1.wrf" + +level ThePit-T3 +players 8 +type 16 +dataset MULTI_T3_C3 +game "multiplay\maps\8c-ThePit.gam" +data "wrf\multi\campaign.wrf" +data "wrf\multi\fog3.wrf" + +level Rush-T3 +players 4 +type 16 +dataset MULTI_T3_C1 +game "multiplay\maps\4c-Rush.gam" +data "wrf\multi\campaign.wrf" +data "wrf\multi\fog1.wrf" + +level Rush2-T3 +players 4 +type 16 +dataset MULTI_T3_C1 +game "multiplay\maps\4c-Rush2.gam" +data "wrf\multi\campaign.wrf" +data "wrf\multi\fog1.wrf" + +level StartUp-T3 +players 2 +type 16 +dataset MULTI_T3_C1 +game "multiplay\maps\2c-StartUp.gam" +data "wrf\multi\campaign.wrf" +data "wrf\multi\fog1.wrf" + +level MizaMaze-T3 +players 8 +type 16 +dataset MULTI_T3_C1 +game "multiplay\maps\8c-MizaMaze.gam" +data "wrf\multi\campaign.wrf" +data "wrf\multi\fog1.wrf" + +level Clover-T3 +players 8 +type 16 +dataset MULTI_T3_C1 +game "multiplay\maps\8c-Clover.gam" +data "wrf\multi\campaign.wrf" +data "wrf\multi\fog1.wrf" + +level UrbanChasm-T3 +players 2 +type 16 +dataset MULTI_T3_C2 +game "multiplay\maps\2c-UrbanChasm.gam" +data "wrf\multi\campaign.wrf" +data "wrf\multi\fog2.wrf" + +level Urbanduel-T3 +players 4 +type 16 +dataset MULTI_T3_C2 +game "multiplay\maps\4c-UrbanDuel.gam" +data "wrf\multi\campaign.wrf" +data "wrf\multi\fog2.wrf" + +level Manhattan-T3 +players 8 +type 16 +dataset MULTI_T3_C2 +game "multiplay\maps\8c-Manhattan.gam" +data "wrf\multi\campaign.wrf" +data "wrf\multi\fog2.wrf" + +level HighGround-T3 +players 2 +type 16 +dataset MULTI_T3_C3 +game "multiplay\maps\2c-HighGround.gam" +data "wrf\multi\campaign.wrf" +data "wrf\multi\fog3.wrf" + +level Mountain-T3 +players 4 +type 16 +dataset MULTI_T3_C3 +game "multiplay\maps\4c-Mountain.gam" +data "wrf\multi\campaign.wrf" +data "wrf\multi\fog3.wrf" + +level Bananas-T3 +players 8 +type 16 +dataset MULTI_T3_C3 +game "multiplay\maps\8c-Bananas.gam" +data "wrf\multi\campaign.wrf" +data "wrf\multi\fog3.wrf" + +level Wheel-T3 +players 8 +type 16 +dataset MULTI_T3_C3 +game "multiplay\maps\8c-WheelOfFortune.gam" +data "wrf\multi\campaign.wrf" +data "wrf\multi\fog3.wrf" + +level Ziggurat-T3 +players 8 +type 16 +dataset MULTI_T3_C1 +game "multiplay\maps\8c-Ziggurat.gam" +data "wrf\multi\campaign.wrf" +data "wrf\multi\fog1.wrf" + +level Valley-T3 +players 4 +type 16 +dataset MULTI_T3_C3 +game "multiplay\maps\4c-ValleyOfDeath.gam" +data "wrf\multi\campaign.wrf" +data "wrf\multi\fog3.wrf" + +level Concrete-T3 +players 8 +type 16 +dataset MULTI_T3_C2 +game "multiplay\maps\8c-ConcretePlayGround.gam" +data "wrf\multi\campaign.wrf" +data "wrf\multi\fog2.wrf" + +level FishNet-T3 +players 4 +type 16 +dataset MULTI_T3_C3 +game "multiplay\maps\4c-Fishnet.gam" +data "wrf\multi\campaign.wrf" +data "wrf\multi\fog3.wrf" + +//********************************************************/ +//* skirmish tech level 2 */ + +level Sk-Rush-T2 +players 4 +type 18 +dataset MULTI_T2_C1 +game "multiplay\maps\4c-rush.gam" +data "wrf\multi\t2-skirmish4.wrf" +data "wrf\multi\fog1.wrf" + +level Sk-StartUp-T2 +players 2 +type 18 +dataset MULTI_T2_C1 +game "multiplay\maps\2c-StartUp.gam" +data "wrf\multi\t2-skirmish2.wrf" +data "wrf\multi\fog1.wrf" + +level Sk-MizaMaze-T2 +players 8 +type 18 +dataset MULTI_T2_C1 +game "multiplay\maps\8c-mizamaze.gam" +data "wrf\multi\t2-skirmish8.wrf" +data "wrf\multi\fog1.wrf" + +level Sk-Clover-T2 +players 8 +type 18 +dataset MULTI_T2_C1 +game "multiplay\maps\8c-clover.gam" +data "wrf\multi\t2-skirmish8.wrf" +data "wrf\multi\fog1.wrf" + +level Sk-UrbanChasm-T2 +players 2 +type 18 +dataset MULTI_T2_C2 +game "multiplay\maps\2c-urbanchasm.gam" +data "wrf\multi\t2-skirmish2.wrf" +data "wrf\multi\fog2.wrf" + +level Sk-UrbanDuel-T2 +players 4 +type 18 +dataset MULTI_T2_C2 +game "multiplay\maps\4c-urbanduel.gam" +data "wrf\multi\t2-skirmish4.wrf" +data "wrf\multi\fog2.wrf" + +level Sk-Manhattan-T2 +players 8 +type 18 +dataset MULTI_T2_C2 +game "multiplay\maps\8c-manhattan.gam" +data "wrf\multi\t2-skirmish8.wrf" +data "wrf\multi\fog2.wrf" + +level Sk-HighGround-T2 +players 2 +type 18 +dataset MULTI_T2_C3 +game "multiplay\maps\2c-highground.gam" +data "wrf\multi\t2-skirmish2.wrf" +data "wrf\multi\fog3.wrf" + +level Sk-Mountain-T2 +players 4 +type 18 +dataset MULTI_T2_C3 +game "multiplay\maps\4c-mountain.gam" +data "wrf\multi\t2-skirmish4.wrf" +data "wrf\multi\fog3.wrf" + +level Sk-Bananas-T2 +players 8 +type 18 +dataset MULTI_T2_C3 +game "multiplay\maps\8c-bananas.gam" +data "wrf\multi\t2-skirmish8.wrf" +data "wrf\multi\fog3.wrf" + +level Sk-Wheel-T2 +players 8 +type 18 +dataset MULTI_T2_C3 +game "multiplay\maps\8c-WheelOfFortune.gam" +data "wrf\multi\t2-skirmish8.wrf" +data "wrf\multi\fog3.wrf" + +level Sk-Ziggurat-T2 +players 8 +type 18 +dataset MULTI_T2_C1 +game "multiplay\maps\8c-Ziggurat.gam" +data "wrf\multi\t2-skirmish8.wrf" +data "wrf\multi\fog1.wrf" + +level Sk-Valley-T2 +players 4 +type 18 +dataset MULTI_T2_C3 +game "multiplay\maps\4c-ValleyOfDeath.gam" +data "wrf\multi\t2-skirmish4.wrf" +data "wrf\multi\fog3.wrf" + +level Sk-Concrete-T2 +players 8 +type 18 +dataset MULTI_T2_C2 +game "multiplay\maps\8c-ConcretePlayGround.gam" +data "wrf\multi\t2-skirmish8.wrf" +data "wrf\multi\fog2.wrf" + +level Sk-FishNets-T2 +players 4 +type 18 +dataset MULTI_T2_C3 +game "multiplay\maps\4c-Fishnet.gam" +data "wrf\multi\t2-skirmish4.wrf" +data "wrf\multi\fog3.wrf" + +level Sk-GreatRift-T2 +players 4 +type 18 +dataset MULTI_T2_C1 +game "multiplay\maps\4c-greatrift.gam" +data "wrf\multi\t2-skirmish4.wrf" +data "wrf\multi\fog1.wrf" + +level Sk-ThePit-T2 +players 8 +type 18 +dataset MULTI_T2_C3 +game "multiplay\maps\8c-ThePit.gam" +data "wrf\multi\t2-skirmish8.wrf" +data "wrf\multi\fog3.wrf" + + + +//*********************************************************/ +//* skirmish tech level 3 + +level Sk-Rush-T3 +players 4 +type 19 +dataset MULTI_T3_C1 +game "multiplay\maps\4c-rush.gam" +data "wrf\multi\t3-skirmish4.wrf" +data "wrf\multi\fog1.wrf" + +level Sk-StartUp-T3 +players 2 +type 19 +dataset MULTI_T3_C1 +game "multiplay\maps\2c-StartUp.gam" +data "wrf\multi\t3-skirmish2.wrf" +data "wrf\multi\fog1.wrf" + +level Sk-MizaMaze-T3 +players 8 +type 19 +dataset MULTI_T3_C1 +game "multiplay\maps\8c-mizamaze.gam" +data "wrf\multi\t3-skirmish8.wrf" +data "wrf\multi\fog1.wrf" + +level Sk-Clover-T3 +players 8 +type 19 +dataset MULTI_T3_C1 +game "multiplay\maps\8c-clover.gam" +data "wrf\multi\t3-skirmish8.wrf" +data "wrf\multi\fog1.wrf" + +level Sk-UrbanChasm-T3 +players 2 +type 19 +dataset MULTI_T3_C2 +game "multiplay\maps\2c-urbanchasm.gam" +data "wrf\multi\t3-skirmish2.wrf" +data "wrf\multi\fog2.wrf" + +level Sk-UrbanDuel-T3 +players 4 +type 19 +dataset MULTI_T3_C2 +game "multiplay\maps\4c-urbanduel.gam" +data "wrf\multi\t3-skirmish4.wrf" +data "wrf\multi\fog2.wrf" + +level Sk-Manhattan-T3 +players 8 +type 19 +dataset MULTI_T3_C2 +game "multiplay\maps\8c-manhattan.gam" +data "wrf\multi\t3-skirmish8.wrf" +data "wrf\multi\fog2.wrf" + +level Sk-Mountain-T3 +players 4 +type 19 +dataset MULTI_T3_C3 +game "multiplay\maps\4c-mountain.gam" +data "wrf\multi\t3-skirmish4.wrf" +data "wrf\multi\fog3.wrf" + +level Sk-HighGround-T3 +players 2 +type 19 +dataset MULTI_T3_C3 +game "multiplay\maps\2c-highground.gam" +data "wrf\multi\t3-skirmish2.wrf" +data "wrf\multi\fog3.wrf" + +level Sk-Bananas-T3 +players 8 +type 19 +dataset MULTI_T3_C3 +game "multiplay\maps\8c-bananas.gam" +data "wrf\multi\t3-skirmish8.wrf" +data "wrf\multi\fog3.wrf" + +level Sk-Wheel-T3 +players 8 +type 19 +dataset MULTI_T3_C3 +game "multiplay\maps\8c-WheelOfFortune.gam" +data "wrf\multi\t3-skirmish8.wrf" +data "wrf\multi\fog3.wrf" + +level Sk-Ziggurat-T3 +players 8 +type 19 +dataset MULTI_T3_C1 +game "multiplay\maps\8c-Ziggurat.gam" +data "wrf\multi\t3-skirmish8.wrf" +data "wrf\multi\fog1.wrf" + +level Sk-Valley-T3 +players 4 +type 19 +dataset MULTI_T3_C3 +game "multiplay\maps\4c-ValleyOfDeath.gam" +data "wrf\multi\t3-skirmish4.wrf" +data "wrf\multi\fog3.wrf" + +level Sk-Concrete-T3 +players 8 +type 19 +dataset MULTI_T3_C2 +game "multiplay\maps\8c-ConcretePlayGround.gam" +data "wrf\multi\t3-skirmish8.wrf" +data "wrf\multi\fog2.wrf" + +level Sk-FishNets-T3 +players 4 +type 19 +dataset MULTI_T3_C3 +game "multiplay\maps\4c-Fishnet.gam" +data "wrf\multi\t3-skirmish4.wrf" +data "wrf\multi\fog3.wrf" + +level Sk-GreatRift-T3 +players 4 +type 19 +dataset MULTI_T3_C1 +game "multiplay\maps\4c-greatrift.gam" +data "wrf\multi\t3-skirmish4.wrf" +data "wrf\multi\fog1.wrf" + +level Sk-ThePit-T3 +players 8 +type 19 +dataset MULTI_T2_C3 +game "multiplay\maps\8c-ThePit.gam" +data "wrf\multi\t3-skirmish8.wrf" +data "wrf\multi\fog3.wrf" +/********************************************************/ +/********************************************************/ +/* MultiPlayer technology enablers */ +/* alex lee april 99 */ + +/* ************************ */ +/* CAMPAIGN SETS */ +/* tech level 1 */ +/* cam 1 MULTI_CAM_1 */ +/* cam 2 MULTI_CAM_2 */ +/* cam 3 MULTI_CAM_3 */ +/* ************************ */ +/* tech level 2 */ +/* cam 1 MULTI_T2_C1 */ +/* cam 2 MULTI_T2_C2 */ +/* cam 3 MULTI_T2_C3 */ +/* ************************ */ +/* tech level 3 */ +/* cam 1 MULTI_T3_C1 */ +/* cam 2 MULTI_T3_C2 */ +/* cam 3 MULTI_T3_C3 */ +/* ************************ */ + +/* ************************ */ +/* GAMETYPES */ +/* */ +/* CAMPAIGN 12 */ +/* CAMPAIGN RESEARCH 2 15 */ +/* CAMPAIGN RESEARCH 3 16 */ +/* */ +/* SKIRMISH 14 */ +/* SKIRMISH RESEARCH 2 18 */ +/* SKIRMISH RESEARCH 3 19 */ + +/* */ +/* reserved (dont use) */ +/* TEAMPLAY 13 */ +/* DMATCH 11 */ +/* ************************ */ + +/* ************************ */ +/* tech level 3 */ +campaign MULTI_T3_C1 +data "wrf\vidmem.wrf" +data "wrf\basic.wrf" +data "wrf\cam1.wrf" +data "wrf\audio.wrf" +data "wrf\piestats.wrf" +data "wrf\stats.wrf" +data "wrf\multires3.wrf" + +campaign MULTI_T3_C2 +data "wrf\vidmem2.wrf" +data "wrf\basic.wrf" +data "wrf\cam2.wrf" +data "wrf\audio.wrf" +data "wrf\piestats.wrf" +data "wrf\stats.wrf" +data "wrf\multires3.wrf" + +campaign MULTI_T3_C3 +data "wrf\vidmem3.wrf" +data "wrf\basic.wrf" +data "wrf\cam3.wrf" +data "wrf\audio.wrf" +data "wrf\piestats.wrf" +data "wrf\stats.wrf" +data "wrf\multires3.wrf" + +// add definitions for ALL current maps for T3 + +/********************************************************/ +/* standard multiplayer campaigns */ + + +//// 003 NewTech - NO New Maps + +level GreatRift-T3 +players 4 +type 16 +dataset MULTI_T3_C1 +game "multiplay\maps\4c-greatrift.gam" +data "wrf\multi\campaign.wrf" +data "wrf\multi\fog1.wrf" + +level ThePit-T3 +players 8 +type 16 +dataset MULTI_T3_C3 +game "multiplay\maps\8c-ThePit.gam" +data "wrf\multi\campaign.wrf" +data "wrf\multi\fog3.wrf" + +level Rush-T3 +players 4 +type 16 +dataset MULTI_T3_C1 +game "multiplay\maps\4c-Rush.gam" +data "wrf\multi\campaign.wrf" +data "wrf\multi\fog1.wrf" + +level Rush2-T3 +players 4 +type 16 +dataset MULTI_T3_C1 +game "multiplay\maps\4c-Rush2.gam" +data "wrf\multi\campaign.wrf" +data "wrf\multi\fog1.wrf" + +level StartUp-T3 +players 2 +type 16 +dataset MULTI_T3_C1 +game "multiplay\maps\2c-StartUp.gam" +data "wrf\multi\campaign.wrf" +data "wrf\multi\fog1.wrf" + +level MizaMaze-T3 +players 8 +type 16 +dataset MULTI_T3_C1 +game "multiplay\maps\8c-MizaMaze.gam" +data "wrf\multi\campaign.wrf" +data "wrf\multi\fog1.wrf" + +level Clover-T3 +players 8 +type 16 +dataset MULTI_T3_C1 +game "multiplay\maps\8c-Clover.gam" +data "wrf\multi\campaign.wrf" +data "wrf\multi\fog1.wrf" + +level UrbanChasm-T3 +players 2 +type 16 +dataset MULTI_T3_C2 +game "multiplay\maps\2c-UrbanChasm.gam" +data "wrf\multi\campaign.wrf" +data "wrf\multi\fog2.wrf" + +level Urbanduel-T3 +players 4 +type 16 +dataset MULTI_T3_C2 +game "multiplay\maps\4c-UrbanDuel.gam" +data "wrf\multi\campaign.wrf" +data "wrf\multi\fog2.wrf" + +level Manhattan-T3 +players 8 +type 16 +dataset MULTI_T3_C2 +game "multiplay\maps\8c-Manhattan.gam" +data "wrf\multi\campaign.wrf" +data "wrf\multi\fog2.wrf" + +level HighGround-T3 +players 2 +type 16 +dataset MULTI_T3_C3 +game "multiplay\maps\2c-HighGround.gam" +data "wrf\multi\campaign.wrf" +data "wrf\multi\fog3.wrf" + +level Mountain-T3 +players 4 +type 16 +dataset MULTI_T3_C3 +game "multiplay\maps\4c-Mountain.gam" +data "wrf\multi\campaign.wrf" +data "wrf\multi\fog3.wrf" + +level Bananas-T3 +players 8 +type 16 +dataset MULTI_T3_C3 +game "multiplay\maps\8c-Bananas.gam" +data "wrf\multi\campaign.wrf" +data "wrf\multi\fog3.wrf" + +level Wheel-T3 +players 8 +type 16 +dataset MULTI_T3_C3 +game "multiplay\maps\8c-WheelOfFortune.gam" +data "wrf\multi\campaign.wrf" +data "wrf\multi\fog3.wrf" + +level Ziggurat-T3 +players 8 +type 16 +dataset MULTI_T3_C1 +game "multiplay\maps\8c-Ziggurat.gam" +data "wrf\multi\campaign.wrf" +data "wrf\multi\fog1.wrf" + +level Valley-T3 +players 4 +type 16 +dataset MULTI_T3_C3 +game "multiplay\maps\4c-ValleyOfDeath.gam" +data "wrf\multi\campaign.wrf" +data "wrf\multi\fog3.wrf" + +level Concrete-T3 +players 8 +type 16 +dataset MULTI_T3_C2 +game "multiplay\maps\8c-ConcretePlayGround.gam" +data "wrf\multi\campaign.wrf" +data "wrf\multi\fog2.wrf" + +level FishNet-T3 +players 4 +type 16 +dataset MULTI_T3_C3 +game "multiplay\maps\4c-Fishnet.gam" +data "wrf\multi\campaign.wrf" +data "wrf\multi\fog3.wrf" + +//********************************************************/ +//* skirmish tech level 2 */ + +level Sk-Rush-T2 +players 4 +type 18 +dataset MULTI_T2_C1 +game "multiplay\maps\4c-rush.gam" +data "wrf\multi\t2-skirmish4.wrf" +data "wrf\multi\fog1.wrf" + +level Sk-StartUp-T2 +players 2 +type 18 +dataset MULTI_T2_C1 +game "multiplay\maps\2c-StartUp.gam" +data "wrf\multi\t2-skirmish2.wrf" +data "wrf\multi\fog1.wrf" + +level Sk-MizaMaze-T2 +players 8 +type 18 +dataset MULTI_T2_C1 +game "multiplay\maps\8c-mizamaze.gam" +data "wrf\multi\t2-skirmish8.wrf" +data "wrf\multi\fog1.wrf" + +level Sk-Clover-T2 +players 8 +type 18 +dataset MULTI_T2_C1 +game "multiplay\maps\8c-clover.gam" +data "wrf\multi\t2-skirmish8.wrf" +data "wrf\multi\fog1.wrf" + +level Sk-UrbanChasm-T2 +players 2 +type 18 +dataset MULTI_T2_C2 +game "multiplay\maps\2c-urbanchasm.gam" +data "wrf\multi\t2-skirmish2.wrf" +data "wrf\multi\fog2.wrf" + +level Sk-UrbanDuel-T2 +players 4 +type 18 +dataset MULTI_T2_C2 +game "multiplay\maps\4c-urbanduel.gam" +data "wrf\multi\t2-skirmish4.wrf" +data "wrf\multi\fog2.wrf" + +level Sk-Manhattan-T2 +players 8 +type 18 +dataset MULTI_T2_C2 +game "multiplay\maps\8c-manhattan.gam" +data "wrf\multi\t2-skirmish8.wrf" +data "wrf\multi\fog2.wrf" + +level Sk-HighGround-T2 +players 2 +type 18 +dataset MULTI_T2_C3 +game "multiplay\maps\2c-highground.gam" +data "wrf\multi\t2-skirmish2.wrf" +data "wrf\multi\fog3.wrf" + +level Sk-Mountain-T2 +players 4 +type 18 +dataset MULTI_T2_C3 +game "multiplay\maps\4c-mountain.gam" +data "wrf\multi\t2-skirmish4.wrf" +data "wrf\multi\fog3.wrf" + +level Sk-Bananas-T2 +players 8 +type 18 +dataset MULTI_T2_C3 +game "multiplay\maps\8c-bananas.gam" +data "wrf\multi\t2-skirmish8.wrf" +data "wrf\multi\fog3.wrf" + +level Sk-Wheel-T2 +players 8 +type 18 +dataset MULTI_T2_C3 +game "multiplay\maps\8c-WheelOfFortune.gam" +data "wrf\multi\t2-skirmish8.wrf" +data "wrf\multi\fog3.wrf" + +level Sk-Ziggurat-T2 +players 8 +type 18 +dataset MULTI_T2_C1 +game "multiplay\maps\8c-Ziggurat.gam" +data "wrf\multi\t2-skirmish8.wrf" +data "wrf\multi\fog1.wrf" + +level Sk-Valley-T2 +players 4 +type 18 +dataset MULTI_T2_C3 +game "multiplay\maps\4c-ValleyOfDeath.gam" +data "wrf\multi\t2-skirmish4.wrf" +data "wrf\multi\fog3.wrf" + +level Sk-Concrete-T2 +players 8 +type 18 +dataset MULTI_T2_C2 +game "multiplay\maps\8c-ConcretePlayGround.gam" +data "wrf\multi\t2-skirmish8.wrf" +data "wrf\multi\fog2.wrf" + +level Sk-FishNets-T2 +players 4 +type 18 +dataset MULTI_T2_C3 +game "multiplay\maps\4c-Fishnet.gam" +data "wrf\multi\t2-skirmish4.wrf" +data "wrf\multi\fog3.wrf" + +level Sk-GreatRift-T2 +players 4 +type 18 +dataset MULTI_T2_C1 +game "multiplay\maps\4c-greatrift.gam" +data "wrf\multi\t2-skirmish4.wrf" +data "wrf\multi\fog1.wrf" + +level Sk-ThePit-T2 +players 8 +type 18 +dataset MULTI_T2_C3 +game "multiplay\maps\8c-ThePit.gam" +data "wrf\multi\t2-skirmish8.wrf" +data "wrf\multi\fog3.wrf" + + + +//*********************************************************/ +//* skirmish tech level 3 + +level Sk-Rush-T3 +players 4 +type 19 +dataset MULTI_T3_C1 +game "multiplay\maps\4c-rush.gam" +data "wrf\multi\t3-skirmish4.wrf" +data "wrf\multi\fog1.wrf" + +level Sk-StartUp-T3 +players 2 +type 19 +dataset MULTI_T3_C1 +game "multiplay\maps\2c-StartUp.gam" +data "wrf\multi\t3-skirmish2.wrf" +data "wrf\multi\fog1.wrf" + +level Sk-MizaMaze-T3 +players 8 +type 19 +dataset MULTI_T3_C1 +game "multiplay\maps\8c-mizamaze.gam" +data "wrf\multi\t3-skirmish8.wrf" +data "wrf\multi\fog1.wrf" + +level Sk-Clover-T3 +players 8 +type 19 +dataset MULTI_T3_C1 +game "multiplay\maps\8c-clover.gam" +data "wrf\multi\t3-skirmish8.wrf" +data "wrf\multi\fog1.wrf" + +level Sk-UrbanChasm-T3 +players 2 +type 19 +dataset MULTI_T3_C2 +game "multiplay\maps\2c-urbanchasm.gam" +data "wrf\multi\t3-skirmish2.wrf" +data "wrf\multi\fog2.wrf" + +level Sk-UrbanDuel-T3 +players 4 +type 19 +dataset MULTI_T3_C2 +game "multiplay\maps\4c-urbanduel.gam" +data "wrf\multi\t3-skirmish4.wrf" +data "wrf\multi\fog2.wrf" + +level Sk-Manhattan-T3 +players 8 +type 19 +dataset MULTI_T3_C2 +game "multiplay\maps\8c-manhattan.gam" +data "wrf\multi\t3-skirmish8.wrf" +data "wrf\multi\fog2.wrf" + +level Sk-Mountain-T3 +players 4 +type 19 +dataset MULTI_T3_C3 +game "multiplay\maps\4c-mountain.gam" +data "wrf\multi\t3-skirmish4.wrf" +data "wrf\multi\fog3.wrf" + +level Sk-HighGround-T3 +players 2 +type 19 +dataset MULTI_T3_C3 +game "multiplay\maps\2c-highground.gam" +data "wrf\multi\t3-skirmish2.wrf" +data "wrf\multi\fog3.wrf" + +level Sk-Bananas-T3 +players 8 +type 19 +dataset MULTI_T3_C3 +game "multiplay\maps\8c-bananas.gam" +data "wrf\multi\t3-skirmish8.wrf" +data "wrf\multi\fog3.wrf" + +level Sk-Wheel-T3 +players 8 +type 19 +dataset MULTI_T3_C3 +game "multiplay\maps\8c-WheelOfFortune.gam" +data "wrf\multi\t3-skirmish8.wrf" +data "wrf\multi\fog3.wrf" + +level Sk-Ziggurat-T3 +players 8 +type 19 +dataset MULTI_T3_C1 +game "multiplay\maps\8c-Ziggurat.gam" +data "wrf\multi\t3-skirmish8.wrf" +data "wrf\multi\fog1.wrf" + +level Sk-Valley-T3 +players 4 +type 19 +dataset MULTI_T3_C3 +game "multiplay\maps\4c-ValleyOfDeath.gam" +data "wrf\multi\t3-skirmish4.wrf" +data "wrf\multi\fog3.wrf" + +level Sk-Concrete-T3 +players 8 +type 19 +dataset MULTI_T3_C2 +game "multiplay\maps\8c-ConcretePlayGround.gam" +data "wrf\multi\t3-skirmish8.wrf" +data "wrf\multi\fog2.wrf" + +level Sk-FishNets-T3 +players 4 +type 19 +dataset MULTI_T3_C3 +game "multiplay\maps\4c-Fishnet.gam" +data "wrf\multi\t3-skirmish4.wrf" +data "wrf\multi\fog3.wrf" + +level Sk-GreatRift-T3 +players 4 +type 19 +dataset MULTI_T3_C1 +game "multiplay\maps\4c-greatrift.gam" +data "wrf\multi\t3-skirmish4.wrf" +data "wrf\multi\fog1.wrf" + +level Sk-ThePit-T3 +players 8 +type 19 +dataset MULTI_T2_C3 +game "multiplay\maps\8c-ThePit.gam" +data "wrf\multi\t3-skirmish8.wrf" +data "wrf\multi\fog3.wrf" // New Maps Only diff --git a/lib/framework/Makefile.am b/lib/framework/Makefile.am index b3503c3b8..148125181 100644 --- a/lib/framework/Makefile.am +++ b/lib/framework/Makefile.am @@ -14,6 +14,7 @@ libframework_a_SOURCES = \ frame_stub.c \ frameresource.c \ heap.c \ + ignorecase.c \ input_stub.c \ mem.c \ strres.c \ @@ -25,6 +26,7 @@ libframework_a_SOURCES = \ memint.h \ treap.h \ fractions.h \ + ignorecase.h \ mono.h \ strres.h \ treapint.h \ diff --git a/lib/framework/Makefile.raw b/lib/framework/Makefile.raw index 51a51a31a..d936fe595 100644 --- a/lib/framework/Makefile.raw +++ b/lib/framework/Makefile.raw @@ -4,6 +4,7 @@ SRC_FILES= block.c \ frame_stub.c \ frameresource.c \ heap.c \ + ignorecase.c \ input_stub.c \ mem.c \ mono.c \ diff --git a/lib/framework/frame_stub.c b/lib/framework/frame_stub.c index d432bbe3d..6b0c3ab4b 100644 --- a/lib/framework/frame_stub.c +++ b/lib/framework/frame_stub.c @@ -15,6 +15,7 @@ #include #include #include +#include "ignorecase.h" // window focus messages //#define DEBUG_GROUP1 @@ -499,7 +500,7 @@ static BOOL loadFile2(const char *pFileName, char **ppFileData, UDWORD *pFileSiz PHYSFS_sint64 filesize; PHYSFS_sint64 length_read; - if (!PHYSFS_exists(pFileName)) { + if (PHYSFSEXT_locateCorrectCase(pFileName)) { if (hard_fail) { debug(LOG_ERROR, "loadFile2: %s not found", pFileName); assert(FALSE); diff --git a/lib/framework/ignorecase.c b/lib/framework/ignorecase.c new file mode 100644 index 000000000..df06f1d21 --- /dev/null +++ b/lib/framework/ignorecase.c @@ -0,0 +1,218 @@ +/** \file ignorecase.c */ + +#include +#include +#include +#include + +#include "physfs.h" +#include "ignorecase.h" + +/** + * Please see ignorecase.h for details. + * + * License: this code is public domain. I make no warranty that it is useful, + * correct, harmless, or environmentally safe. + * + * This particular file may be used however you like, including copying it + * verbatim into a closed-source project, exploiting it commercially, and + * removing any trace of my name from the source (although I hope you won't + * do that). I welcome enhancements and corrections to this file, but I do + * not require you to send me patches if you make changes. This code has + * NO WARRANTY. + * + * Unless otherwise stated, the rest of PhysicsFS falls under the zlib license. + * Please see LICENSE in the root of the source tree. + * + * \author Ryan C. Gordon. + */ + +/* I'm not screwing around with stricmp vs. strcasecmp... */ +static int caseInsensitiveStringCompare(const char *x, const char *y) +{ + int ux, uy; + do + { + ux = toupper((int) *x); + uy = toupper((int) *y); + if (ux != uy) + return((ux > uy) ? 1 : -1); + x++; + y++; + } while ((ux) && (uy)); + + return(0); +} /* caseInsensitiveStringCompare */ + + +static int locateOneElement(char *buf) +{ + char *ptr; + char **rc; + char **i; + + if (PHYSFS_exists(buf)) + return(1); /* quick rejection: exists in current case. */ + + ptr = strrchr(buf, '/'); /* find entry at end of path. */ + if (ptr == NULL) + { + rc = PHYSFS_enumerateFiles("/"); + ptr = buf; + } /* if */ + else + { + *ptr = '\0'; + rc = PHYSFS_enumerateFiles(buf); + *ptr = '/'; + ptr++; /* point past dirsep to entry itself. */ + } /* else */ + + for (i = rc; *i != NULL; i++) + { + if (caseInsensitiveStringCompare(*i, ptr) == 0) + { + strcpy(ptr, *i); /* found a match. Overwrite with this case. */ + PHYSFS_freeList(rc); + return(1); + } /* if */ + } /* for */ + + /* no match at all... */ + PHYSFS_freeList(rc); + return(0); +} /* locateOneElement */ + + +int PHYSFSEXT_locateCorrectCase(char *buf) +{ + int rc; + char *ptr; + char *prevptr; + + while (*buf == '/') /* skip any '/' at start of string... */ + buf++; + + ptr = prevptr = buf; + if (*ptr == '\0') + return(0); /* Uh...I guess that's success. */ + + while (ptr = strchr(ptr + 1, '/')) + { + *ptr = '\0'; /* block this path section off */ + rc = locateOneElement(buf); + *ptr = '/'; /* restore path separator */ + if (!rc) + return(-2); /* missing element in path. */ + } /* while */ + + /* check final element... */ + return(locateOneElement(buf) ? 0 : -1); +} /* PHYSFSEXT_locateCorrectCase */ + + +#ifdef TEST_PHYSFSEXT_LOCATECORRECTCASE +int main(int argc, char **argv) +{ + int rc; + char buf[128]; + PHYSFS_File *f; + + if (!PHYSFS_init(argv[0])) + { + fprintf(stderr, "PHYSFS_init(): %s\n", PHYSFS_getLastError()); + return(1); + } /* if */ + + if (!PHYSFS_addToSearchPath(".", 1)) + { + fprintf(stderr, "PHYSFS_addToSearchPath(): %s\n", PHYSFS_getLastError()); + PHYSFS_deinit(); + return(1); + } /* if */ + + if (!PHYSFS_setWriteDir(".")) + { + fprintf(stderr, "PHYSFS_setWriteDir(): %s\n", PHYSFS_getLastError()); + PHYSFS_deinit(); + return(1); + } /* if */ + + if (!PHYSFS_mkdir("/a/b/c")) + { + fprintf(stderr, "PHYSFS_mkdir(): %s\n", PHYSFS_getLastError()); + PHYSFS_deinit(); + return(1); + } /* if */ + + if (!PHYSFS_mkdir("/a/b/C")) + { + fprintf(stderr, "PHYSFS_mkdir(): %s\n", PHYSFS_getLastError()); + PHYSFS_deinit(); + return(1); + } /* if */ + + f = PHYSFS_openWrite("/a/b/c/x.txt"); + PHYSFS_close(f); + if (f == NULL) + { + fprintf(stderr, "PHYSFS_openWrite(): %s\n", PHYSFS_getLastError()); + PHYSFS_deinit(); + return(1); + } /* if */ + + f = PHYSFS_openWrite("/a/b/C/X.txt"); + PHYSFS_close(f); + if (f == NULL) + { + fprintf(stderr, "PHYSFS_openWrite(): %s\n", PHYSFS_getLastError()); + PHYSFS_deinit(); + return(1); + } /* if */ + + strcpy(buf, "/a/b/c/x.txt"); + rc = PHYSFSEXT_locateCorrectCase(buf); + if ((rc != 0) || (strcmp(buf, "/a/b/c/x.txt") != 0)) + printf("test 1 failed\n"); + + strcpy(buf, "/a/B/c/x.txt"); + rc = PHYSFSEXT_locateCorrectCase(buf); + if ((rc != 0) || (strcmp(buf, "/a/b/c/x.txt") != 0)) + printf("test 2 failed\n"); + + strcpy(buf, "/a/b/C/x.txt"); + rc = PHYSFSEXT_locateCorrectCase(buf); + if ((rc != 0) || (strcmp(buf, "/a/b/C/X.txt") != 0)) + printf("test 3 failed\n"); + + strcpy(buf, "/a/b/c/X.txt"); + rc = PHYSFSEXT_locateCorrectCase(buf); + if ((rc != 0) || (strcmp(buf, "/a/b/c/x.txt") != 0)) + printf("test 4 failed\n"); + + strcpy(buf, "/a/b/c/z.txt"); + rc = PHYSFSEXT_locateCorrectCase(buf); + if ((rc != -1) || (strcmp(buf, "/a/b/c/z.txt") != 0)) + printf("test 5 failed\n"); + + strcpy(buf, "/A/B/Z/z.txt"); + rc = PHYSFSEXT_locateCorrectCase(buf); + if ((rc != -2) || (strcmp(buf, "/a/b/Z/z.txt") != 0)) + printf("test 6 failed\n"); + + printf("Testing completed.\n"); + printf(" If no errors were reported, you're good to go.\n"); + + PHYSFS_delete("/a/b/c/x.txt"); + PHYSFS_delete("/a/b/C/X.txt"); + PHYSFS_delete("/a/b/c"); + PHYSFS_delete("/a/b/C"); + PHYSFS_delete("/a/b"); + PHYSFS_delete("/a"); + PHYSFS_deinit(); + return(0); +} /* main */ +#endif + +/* end of ignorecase.c ... */ + diff --git a/lib/framework/ignorecase.h b/lib/framework/ignorecase.h new file mode 100644 index 000000000..873202e09 --- /dev/null +++ b/lib/framework/ignorecase.h @@ -0,0 +1,75 @@ +/** \file ignorecase.h */ + +/** + * \mainpage PhysicsFS ignorecase + * + * This is an extension to PhysicsFS to let you handle files in a + * case-insensitive manner, regardless of what sort of filesystem or + * archive they reside in. It does this by enumerating directories as + * needed and manually locating matching entries. + * + * Please note that this brings with it some caveats: + * - On filesystems that are case-insensitive to start with, such as those + * used on Windows or MacOS, you are adding extra overhead. + * - On filesystems that are case-sensitive, you might select the wrong dir + * or file (which brings security considerations and potential bugs). This + * code favours exact case matches, but you will lose access to otherwise + * duplicate filenames, or you might go down a wrong directory tree, etc. + * In practive, this is rarely a problem, but you need to be aware of it. + * - This doesn't do _anything_ with the write directory; you're on your + * own for opening the right files for writing. You can sort of get around + * this by adding your write directory to the search path, but then the + * interpolated directory tree can screw you up even more. + * + * This code should be considered an aid for legacy code. New development + * shouldn't do dumbass things that require this aid in the first place. :) + * + * Usage: Set up PhysicsFS as you normally would, then use + * PHYSFSEXT_locateCorrectCase() to get a "correct" pathname to pass to + * functions like PHYSFS_openRead(), etc. + * + * License: this code is public domain. I make no warranty that it is useful, + * correct, harmless, or environmentally safe. + * + * This particular file may be used however you like, including copying it + * verbatim into a closed-source project, exploiting it commercially, and + * removing any trace of my name from the source (although I hope you won't + * do that). I welcome enhancements and corrections to this file, but I do + * not require you to send me patches if you make changes. This code has + * NO WARRANTY. + * + * Unless otherwise stated, the rest of PhysicsFS falls under the zlib license. + * Please see LICENSE in the root of the source tree. + * + * \author Ryan C. Gordon. + */ + + +/** + * \fn int PHYSFSEXT_locateCorrectCase(char *buf) + * \brief Find an existing filename with matching case. + * + * This function will look for a path/filename that matches the passed in + * buffer. Each element of the buffer's path is checked for a + * case-insensitive match. The buffer must specify a null-terminated string + * in platform-independent notation. + * + * Please note results may be skewed differently depending on whether symlinks + * are enabled or not. + * + * Each element of the buffer is overwritten with the actual case of an + * existing match. If there is no match, the search aborts and reports an + * error. Exact matches are favored over case-insensitive matches. + * + * THIS IS RISKY. Please do not use this function for anything but crappy + * legacy code. + * + * \param buf Buffer with null-terminated string of path/file to locate. + * This buffer will be modified by this function. + * \return zero if match was found, -1 if the final element (the file itself) + * is missing, -2 if one of the parent directories is missing. + */ +int PHYSFSEXT_locateCorrectCase(char *buf); + +/* end of ignorecase.h ... */ + diff --git a/src/revision.h b/src/revision.h index 97fcc288e..263819873 100644 --- a/src/revision.h +++ b/src/revision.h @@ -1 +1 @@ -#define SVN_REVISION "Revision 36M" +#define SVN_REVISION "Revision 37M"