Skip to content

Commit

Permalink
Made MapUpdater, fixed crosshairs issues and re-made grid tiles
Browse files Browse the repository at this point in the history
  • Loading branch information
@Ohmnivore
Ohmnivore committed Jun 10, 2014
1 parent 23831c0 commit 19a915e
Show file tree
Hide file tree
Showing 68 changed files with 3,224 additions and 247 deletions.
Binary file modified Client/export/windows/cpp/bin/SkullRush.exe
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion Client/export/windows/cpp/bin/manifest
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
aoy4:pathy34:assets%2Fdata%2Fdata-goes-here.txty4:typey4:TEXTy2:idR1goR0y29:assets%2Fgfx%2Fui%2Fpalma.pngR2y5:IMAGER4R5goR0y29:assets%2Fgfx%2Fui%2Fpalma.psdR2y6:BINARYR4R7goR0y34:assets%2Fgfx%2Fui%2Ftitle_back.pngR2R6R4R9goR0y36:assets%2Fimages%2Fimages-go-here.txtR2R3R4R10goR0y17:assets%2Flogo.psdR2R8R4R11goR0y36:assets%2Fmusic%2Fmusic-goes-here.txtR2R3R4R12goR0y36:assets%2Fsounds%2Fsounds-go-here.txtR2R3R4R13goR0y30:assets%2Fxml%2Fempty_popup.xmlR2R3R4R14goR0y23:assets%2Fxml%2Fhome.xmlR2R3R4R15goR0y30:assets%2Fxml%2F_ui_globals.xmlR2R3R4R16goR0y32:shared%2Fimages%2Fbackground.pngR2R6R4R17goR0y27:shared%2Fimages%2Fcrate.pngR2R6R4R18goR0y39:shared%2Fimages%2Fexplosionparticle.pngR2R6R4R19goR0y28:shared%2Fimages%2Fflag_b.pngR2R6R4R20goR0y29:shared%2Fimages%2Fflag_bh.pngR2R6R4R21goR0y28:shared%2Fimages%2Fflag_g.pngR2R6R4R22goR0y29:shared%2Fimages%2Fflag_gh.pngR2R6R4R23goR0y28:shared%2Fimages%2Fflag_n.pngR2R6R4R24goR0y28:shared%2Fimages%2Fflag_r.pngR2R6R4R25goR0y29:shared%2Fimages%2Fflag_rh.pngR2R6R4R26goR0y28:shared%2Fimages%2Fflag_y.pngR2R6R4R27goR0y29:shared%2Fimages%2Fflag_yh.pngR2R6R4R28goR0y32:shared%2Fimages%2Fgridtiles2.pngR2R6R4R29goR0y25:shared%2Fimages%2Fgun.pngR2R6R4R30goR0y37:shared%2Fimages%2Fgun_eviscerator.pngR2R6R4R31goR0y44:shared%2Fimages%2Fgun_eviscerator_bullet.pngR2R6R4R32goR0y42:shared%2Fimages%2Fgun_eviscerator_icon.pngR2R6R4R33goR0y41:shared%2Fimages%2Fgun_launcher_bullet.pngR2R6R4R34goR0y39:shared%2Fimages%2Fgun_launcher_icon.pngR2R6R4R35goR0y37:shared%2Fimages%2Fgun_peacekeeper.pngR2R6R4R36goR0y44:shared%2Fimages%2Fgun_peacekeeper_bullet.pngR2R6R4R37goR0y42:shared%2Fimages%2Fgun_peacekeeper_icon.pngR2R6R4R38goR0y34:shared%2Fimages%2Fgun_splasher.pngR2R6R4R39goR0y41:shared%2Fimages%2Fgun_splasher_bullet.pngR2R6R4R40goR0y39:shared%2Fimages%2Fgun_splasher_icon.pngR2R6R4R41goR0y32:shared%2Fimages%2Fplayerblue.pngR2R6R4R42goR0y33:shared%2Fimages%2Fplayergreen.pngR2R6R4R43goR0y31:shared%2Fimages%2Fplayerred.pngR2R6R4R44goR0y34:shared%2Fimages%2Fplayeryellow.pngR2R6R4R45goR0y36:shared%2Fimages%2Fpowerup_health.pngR2R6R4R46goR0y32:shared%2Fimages%2Fscifitiles.pngR2R6R4R47goR0y37:shared%2Fimages%2Fscifitiles_copy.pngR2R6R4R48goR0y27:shared%2Fimages%2Ftrail.pngR2R6R4R49goR0y35:shared%2Ftiledefs%2Fscifitiles.jsonR2R3R4R50goR0y35:shared%2Ftiledefs%2FSkullSolid.tsetR2R3R4R51goR0y24:crashdumper%2F%2Fcpu.batR2R3R4R52goR0y24:crashdumper%2F%2Fgpu.batR2R3R4R53goR0y27:crashdumper%2F%2Fmemory.batR2R3R4R54goR0y23:crashdumper%2F%2Fos.batR2R3R4R55goR0y26:assets%2Fsounds%2Fbeep.oggR2y5:SOUNDR4R56goR0y28:assets%2Fsounds%2Fflixel.oggR2R57R4R58goR0y34:flixel%2Fflixel-ui%2Fimg%2Fbox.pngR2R6R4R59goR0y37:flixel%2Fflixel-ui%2Fimg%2Fbutton.pngR2R6R4R60goR0y48:flixel%2Fflixel-ui%2Fimg%2Fbutton_arrow_down.pngR2R6R4R61goR0y48:flixel%2Fflixel-ui%2Fimg%2Fbutton_arrow_left.pngR2R6R4R62goR0y49:flixel%2Fflixel-ui%2Fimg%2Fbutton_arrow_right.pngR2R6R4R63goR0y46:flixel%2Fflixel-ui%2Fimg%2Fbutton_arrow_up.pngR2R6R4R64goR0y42:flixel%2Fflixel-ui%2Fimg%2Fbutton_thin.pngR2R6R4R65goR0y44:flixel%2Fflixel-ui%2Fimg%2Fbutton_toggle.pngR2R6R4R66goR0y40:flixel%2Fflixel-ui%2Fimg%2Fcheck_box.pngR2R6R4R67goR0y41:flixel%2Fflixel-ui%2Fimg%2Fcheck_mark.pngR2R6R4R68goR0y37:flixel%2Fflixel-ui%2Fimg%2Fchrome.pngR2R6R4R69goR0y42:flixel%2Fflixel-ui%2Fimg%2Fchrome_flat.pngR2R6R4R70goR0y43:flixel%2Fflixel-ui%2Fimg%2Fchrome_inset.pngR2R6R4R71goR0y43:flixel%2Fflixel-ui%2Fimg%2Fchrome_light.pngR2R6R4R72goR0y44:flixel%2Fflixel-ui%2Fimg%2Fdropdown_mark.pngR2R6R4R73goR0y41:flixel%2Fflixel-ui%2Fimg%2Ffinger_big.pngR2R6R4R74goR0y43:flixel%2Fflixel-ui%2Fimg%2Ffinger_small.pngR2R6R4R75goR0y38:flixel%2Fflixel-ui%2Fimg%2Fhilight.pngR2R6R4R76goR0y36:flixel%2Fflixel-ui%2Fimg%2Finvis.pngR2R6R4R77goR0y41:flixel%2Fflixel-ui%2Fimg%2Fminus_mark.pngR2R6R4R78goR0y40:flixel%2Fflixel-ui%2Fimg%2Fplus_mark.pngR2R6R4R79goR0y36:flixel%2Fflixel-ui%2Fimg%2Fradio.pngR2R6R4R80goR0y40:flixel%2Fflixel-ui%2Fimg%2Fradio_dot.pngR2R6R4R81goR0y37:flixel%2Fflixel-ui%2Fimg%2Fswatch.pngR2R6R4R82goR0y34:flixel%2Fflixel-ui%2Fimg%2Ftab.pngR2R6R4R83goR0y39:flixel%2Fflixel-ui%2Fimg%2Ftab_back.pngR2R6R4R84goR0y39:flixel%2Fflixel-ui%2Fxml%2Fdefaults.xmlR2R3R4R85goR0y53:flixel%2Fflixel-ui%2Fxml%2Fdefault_loading_screen.xmlR2R3R4R86goR0y44:flixel%2Fflixel-ui%2Fxml%2Fdefault_popup.xmlR2R3R4R87gh
aoy4:pathy34:assets%2Fdata%2Fdata-goes-here.txty4:typey4:TEXTy2:idR1goR0y29:assets%2Fgfx%2Fui%2Fpalma.pngR2y5:IMAGER4R5goR0y29:assets%2Fgfx%2Fui%2Fpalma.psdR2y6:BINARYR4R7goR0y34:assets%2Fgfx%2Fui%2Ftitle_back.pngR2R6R4R9goR0y36:assets%2Fimages%2Fimages-go-here.txtR2R3R4R10goR0y17:assets%2Flogo.psdR2R8R4R11goR0y36:assets%2Fmusic%2Fmusic-goes-here.txtR2R3R4R12goR0y36:assets%2Fsounds%2Fsounds-go-here.txtR2R3R4R13goR0y30:assets%2Fxml%2Fempty_popup.xmlR2R3R4R14goR0y23:assets%2Fxml%2Fhome.xmlR2R3R4R15goR0y30:assets%2Fxml%2F_ui_globals.xmlR2R3R4R16goR0y32:shared%2Fimages%2Fbackground.pngR2R6R4R17goR0y34:shared%2Fimages%2Fbackground_s.pngR2R6R4R18goR0y27:shared%2Fimages%2Fblank.pngR2R6R4R19goR0y27:shared%2Fimages%2Fcrate.pngR2R6R4R20goR0y32:shared%2Fimages%2Fcrosshairs.pngR2R6R4R21goR0y33:shared%2Fimages%2Fcrosshairs2.pngR2R6R4R22goR0y39:shared%2Fimages%2Fexplosionparticle.pngR2R6R4R23goR0y28:shared%2Fimages%2Fflag_b.pngR2R6R4R24goR0y29:shared%2Fimages%2Fflag_bh.pngR2R6R4R25goR0y28:shared%2Fimages%2Fflag_g.pngR2R6R4R26goR0y29:shared%2Fimages%2Fflag_gh.pngR2R6R4R27goR0y28:shared%2Fimages%2Fflag_n.pngR2R6R4R28goR0y28:shared%2Fimages%2Fflag_r.pngR2R6R4R29goR0y29:shared%2Fimages%2Fflag_rh.pngR2R6R4R30goR0y28:shared%2Fimages%2Fflag_y.pngR2R6R4R31goR0y29:shared%2Fimages%2Fflag_yh.pngR2R6R4R32goR0y32:shared%2Fimages%2Fgridtiles2.pngR2R6R4R33goR0y32:shared%2Fimages%2Fgridtiles3.pngR2R6R4R34goR0y32:shared%2Fimages%2Fgridtiles4.pngR2R6R4R35goR0y25:shared%2Fimages%2Fgun.pngR2R6R4R36goR0y37:shared%2Fimages%2Fgun_eviscerator.pngR2R6R4R37goR0y44:shared%2Fimages%2Fgun_eviscerator_bullet.pngR2R6R4R38goR0y42:shared%2Fimages%2Fgun_eviscerator_icon.pngR2R6R4R39goR0y41:shared%2Fimages%2Fgun_launcher_bullet.pngR2R6R4R40goR0y39:shared%2Fimages%2Fgun_launcher_icon.pngR2R6R4R41goR0y37:shared%2Fimages%2Fgun_peacekeeper.pngR2R6R4R42goR0y44:shared%2Fimages%2Fgun_peacekeeper_bullet.pngR2R6R4R43goR0y42:shared%2Fimages%2Fgun_peacekeeper_icon.pngR2R6R4R44goR0y34:shared%2Fimages%2Fgun_splasher.pngR2R6R4R45goR0y41:shared%2Fimages%2Fgun_splasher_bullet.pngR2R6R4R46goR0y39:shared%2Fimages%2Fgun_splasher_icon.pngR2R6R4R47goR0y32:shared%2Fimages%2Fplayerblue.pngR2R6R4R48goR0y33:shared%2Fimages%2Fplayergreen.pngR2R6R4R49goR0y31:shared%2Fimages%2Fplayerred.pngR2R6R4R50goR0y34:shared%2Fimages%2Fplayeryellow.pngR2R6R4R51goR0y36:shared%2Fimages%2Fpowerup_health.pngR2R6R4R52goR0y32:shared%2Fimages%2Fscifitiles.pngR2R6R4R53goR0y37:shared%2Fimages%2Fscifitiles_copy.pngR2R6R4R54goR0y27:shared%2Fimages%2Ftrail.pngR2R6R4R55goR0y35:shared%2Ftiledefs%2Fscifitiles.jsonR2R3R4R56goR0y35:shared%2Ftiledefs%2FSkullSolid.tsetR2R3R4R57goR0y24:crashdumper%2F%2Fcpu.batR2R3R4R58goR0y24:crashdumper%2F%2Fgpu.batR2R3R4R59goR0y27:crashdumper%2F%2Fmemory.batR2R3R4R60goR0y23:crashdumper%2F%2Fos.batR2R3R4R61goR0y26:assets%2Fsounds%2Fbeep.oggR2y5:SOUNDR4R62goR0y28:assets%2Fsounds%2Fflixel.oggR2R63R4R64goR0y34:flixel%2Fflixel-ui%2Fimg%2Fbox.pngR2R6R4R65goR0y37:flixel%2Fflixel-ui%2Fimg%2Fbutton.pngR2R6R4R66goR0y48:flixel%2Fflixel-ui%2Fimg%2Fbutton_arrow_down.pngR2R6R4R67goR0y48:flixel%2Fflixel-ui%2Fimg%2Fbutton_arrow_left.pngR2R6R4R68goR0y49:flixel%2Fflixel-ui%2Fimg%2Fbutton_arrow_right.pngR2R6R4R69goR0y46:flixel%2Fflixel-ui%2Fimg%2Fbutton_arrow_up.pngR2R6R4R70goR0y42:flixel%2Fflixel-ui%2Fimg%2Fbutton_thin.pngR2R6R4R71goR0y44:flixel%2Fflixel-ui%2Fimg%2Fbutton_toggle.pngR2R6R4R72goR0y40:flixel%2Fflixel-ui%2Fimg%2Fcheck_box.pngR2R6R4R73goR0y41:flixel%2Fflixel-ui%2Fimg%2Fcheck_mark.pngR2R6R4R74goR0y37:flixel%2Fflixel-ui%2Fimg%2Fchrome.pngR2R6R4R75goR0y42:flixel%2Fflixel-ui%2Fimg%2Fchrome_flat.pngR2R6R4R76goR0y43:flixel%2Fflixel-ui%2Fimg%2Fchrome_inset.pngR2R6R4R77goR0y43:flixel%2Fflixel-ui%2Fimg%2Fchrome_light.pngR2R6R4R78goR0y44:flixel%2Fflixel-ui%2Fimg%2Fdropdown_mark.pngR2R6R4R79goR0y41:flixel%2Fflixel-ui%2Fimg%2Ffinger_big.pngR2R6R4R80goR0y43:flixel%2Fflixel-ui%2Fimg%2Ffinger_small.pngR2R6R4R81goR0y38:flixel%2Fflixel-ui%2Fimg%2Fhilight.pngR2R6R4R82goR0y36:flixel%2Fflixel-ui%2Fimg%2Finvis.pngR2R6R4R83goR0y41:flixel%2Fflixel-ui%2Fimg%2Fminus_mark.pngR2R6R4R84goR0y40:flixel%2Fflixel-ui%2Fimg%2Fplus_mark.pngR2R6R4R85goR0y36:flixel%2Fflixel-ui%2Fimg%2Fradio.pngR2R6R4R86goR0y40:flixel%2Fflixel-ui%2Fimg%2Fradio_dot.pngR2R6R4R87goR0y37:flixel%2Fflixel-ui%2Fimg%2Fswatch.pngR2R6R4R88goR0y34:flixel%2Fflixel-ui%2Fimg%2Ftab.pngR2R6R4R89goR0y39:flixel%2Fflixel-ui%2Fimg%2Ftab_back.pngR2R6R4R90goR0y39:flixel%2Fflixel-ui%2Fxml%2Fdefaults.xmlR2R3R4R91goR0y53:flixel%2Fflixel-ui%2Fxml%2Fdefault_loading_screen.xmlR2R3R4R92goR0y44:flixel%2Fflixel-ui%2Fxml%2Fdefault_popup.xmlR2R3R4R93gh
Binary file added Client/export/windows/cpp/bin/shared/images/background_s.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Client/export/windows/cpp/bin/shared/images/blank.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Client/export/windows/cpp/bin/shared/images/crosshairs.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Client/export/windows/cpp/bin/shared/images/crosshairs2.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Client/export/windows/cpp/bin/shared/images/gridtiles3.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Client/export/windows/cpp/bin/shared/images/gridtiles4.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
56 changes: 56 additions & 0 deletions Client/source/FlxCrosshairs.hx
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
package ;
import ext.FlxTrailExt;
import flixel.FlxG;
import flixel.FlxSprite;
import flixel.group.FlxGroup;

/**
* ...
* @author Ohmnivore
*/
class FlxCrosshairs extends FlxSprite
{
public var interior:FlxSprite;
public var trail:FlxTrailExt;

public function new()
{
super(0, 0);
loadRotatedGraphic("shared/images/crosshairs.png", 360, -1, true, true);

trail = new FlxTrailExt(this, "shared/images/crosshairs2.png");
trail.rotationsEnabled = false;
trail.setTrailOffset(6, 6);

interior = new FlxSprite(0, 0);
interior.loadRotatedGraphic("shared/images/crosshairs2.png", 360, -1, true, true);

//Reg.state.trailArea.add(interior);
interior.visible = false;

//Reg.state.trailArea.add(this);
//visible = false;
}

public function addToGroup(G:FlxGroup):Void
{
G.add(interior);
G.add(trail);
G.add(this);
}

override public function update():Void
{
super.update();

x = FlxG.mouse.x - width / 2;
y = FlxG.mouse.y - height / 2;

interior.x = FlxG.mouse.x - interior.width / 2;
interior.y = FlxG.mouse.y - interior.height / 2;

angle += 0.3;
interior.angle -= 0.15;
}

}
2 changes: 2 additions & 0 deletions Client/source/Menu.hx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ class Menu extends FlxSubState
override public function create():Void
{
super.create();
FlxG.mouse.unload();

OPENED = true;

Expand Down Expand Up @@ -44,6 +45,7 @@ class Menu extends FlxSubState
override public function destroy():Void
{
OPENED = false;
FlxG.mouse.load("shared/images/blank.png");

super.destroy();
}
Expand Down
27 changes: 27 additions & 0 deletions Client/source/PlayState.hx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import cpp.vm.Mutex;
import cpp.vm.Thread;
import enet.ENet;
import flash.utils.ByteArray;
import flixel.addons.effects.FlxTrailArea;
import flixel.addons.weapon.FlxBullet;
import flixel.effects.particles.FlxEmitterExt;
import flixel.FlxCamera;
Expand All @@ -25,6 +26,7 @@ import haxe.macro.Expr.Function;
import mloader.Loader.LoaderErrorType;
import networkobj.NReg;
import networkobj.NScoreManager;
import openfl.Vector.Vector;
import ui.Spawn;
import ext.FlxWeaponExt;

Expand Down Expand Up @@ -61,6 +63,9 @@ class PlayState extends FlxState

public var wepHUD:WeaponHUD;
public var wepBar:WeaponBar;
public var mouseSprite:FlxCrosshairs;

public var trailArea:FlxTrailArea;

/**
* Function that is called up when to state is created to set it up.
Expand All @@ -77,6 +82,8 @@ class PlayState extends FlxState
// Show the mouse (in case it hasn't been disabled)
#if !FLX_NO_MOUSE
FlxG.mouse.visible = true;
FlxG.mouse.load("shared/images/blank.png");
//FlxG.mouse.load("shared/images/crosshairs.png", 0.5, 0, 0);
#end

super.create();
Expand Down Expand Up @@ -108,6 +115,11 @@ class PlayState extends FlxState
add(hud);
scores = new NScoreManager();

//trailArea = new FlxTrailArea(0, 0, FlxG.width, FlxG.height);
//under_players.add(trailArea);
//
//hud.add(new FlxCrosshairs());

Reg.chatbox = new ChatBox();
hud.add(Reg.chatbox);
Reg.chatbox.callback = sendChatMsg;
Expand Down Expand Up @@ -226,6 +238,21 @@ class PlayState extends FlxState
OgmoLoader.loadXML(MapString, this);
//SkullClient.initClient();

//if (trailArea != null)
//{
//under_players.clear();
//trailArea.kill();
//}
//trailArea = new FlxTrailArea(0, 0, FlxG.width, FlxG.height, 0.5, 2, false, true);
//under_players.add(trailArea);
hud.clear();
//hud.add(new FlxCrosshairs());
new FlxCrosshairs().addToGroup(hud);

trailArea.x = collidemap.x - FlxG.width / 2;
trailArea.y = collidemap.y - FlxG.height / 2;
trailArea.setSize(collidemap.width + FlxG.width, collidemap.height + FlxG.height);

for (p in playermap.iterator())
{
var pl:Player = p;
Expand Down
7 changes: 7 additions & 0 deletions Client/source/ui/Spawn.hx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ class Spawn extends FlxUISubState
override public function create():Void
{
super.create();
FlxG.mouse.unload();

group = new FlxSpriteGroup();
group.scrollFactor.set();
Expand Down Expand Up @@ -91,6 +92,12 @@ class Spawn extends FlxUISubState
timerLabel.text = "Respawn in: " + Std.string(Std.int(deathTimer.timeLeft));
}

override public function destroy():Void
{
FlxG.mouse.load("shared/images/blank.png");
super.destroy();
}

private function spawn():Void
{
Msg.SpawnRequest.data.set("team", Std.parseInt(LAST_SELECTED));
Expand Down
53 changes: 53 additions & 0 deletions MapUpdater/New Project.hxproj
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
<?xml version="1.0" encoding="utf-8"?>
<project version="2">
<!-- Output SWF options -->
<output>
<movie outputType="Application" />
<movie input="" />
<movie path="bin" />
<movie fps="0" />
<movie width="0" />
<movie height="0" />
<movie version="1" />
<movie minorVersion="0" />
<movie platform="C++" />
<movie background="#FFFFFF" />
</output>
<!-- Other classes to be compiled into your SWF -->
<classpaths>
<class path="src" />
</classpaths>
<!-- Build options -->
<build>
<option directives="" />
<option flashStrict="False" />
<option noInlineOnDebug="False" />
<option mainClass="Main" />
<option enabledebug="False" />
<option additional="" />
</build>
<!-- haxelib libraries -->
<haxelib>
<!-- example: <library name="..." /> -->
</haxelib>
<!-- Class files to compile (other referenced classes will automatically be included) -->
<compileTargets>
<compile path="src\Main.hx" />
</compileTargets>
<!-- Paths to exclude from the Project Explorer tree -->
<hiddenPaths>
<!-- example: <hidden path="..." /> -->
</hiddenPaths>
<!-- Executed before build -->
<preBuildCommand />
<!-- Executed after build -->
<postBuildCommand alwaysRun="False" />
<!-- Other project options -->
<options>
<option showHiddenPaths="False" />
<option testMovie="Custom" />
<option testMovieCommand="run.bat" />
</options>
<!-- Plugin storage -->
<storage />
</project>
3 changes: 3 additions & 0 deletions MapUpdater/Run.bat
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
@echo off
bin\Main-debug.exe
pause
107 changes: 107 additions & 0 deletions MapUpdater/bin/Build.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,107 @@
<xml>
<set name="HXCPP_API_LEVEL" value="311" />
<files id="haxe">
<compilerflag value="-Iinclude"/>
<file name="src/sys/io/FileOutput.cpp">
<depend name="include/cpp/Lib.h"/>
<depend name="include/haxe/io/Bytes.h"/>
<depend name="include/haxe/io/Error.h"/>
<depend name="include/haxe/io/Output.h"/>
<depend name="include/sys/io/FileOutput.h"/>
</file>
<file name="src/sys/io/File.cpp">
<depend name="include/cpp/Lib.h"/>
<depend name="include/haxe/io/Bytes.h"/>
<depend name="include/haxe/io/Output.h"/>
<depend name="include/sys/io/File.h"/>
<depend name="include/sys/io/FileOutput.h"/>
</file>
<file name="src/sys/FileSystem.cpp">
<depend name="include/cpp/Lib.h"/>
<depend name="include/haxe/io/Path.h"/>
<depend name="include/sys/FileSystem.h"/>
<depend name="include/sys/_FileSystem/FileKind.h"/>
</file>
<file name="src/sys/_FileSystem/FileKind.cpp">
<depend name="include/sys/_FileSystem/FileKind.h"/>
</file>
<file name="src/haxe/io/Path.cpp">
<depend name="include/EReg.h"/>
<depend name="include/haxe/io/Path.h"/>
</file>
<file name="src/haxe/io/Error.cpp">
<depend name="include/haxe/io/Error.h"/>
</file>
<file name="src/haxe/io/Eof.cpp">
<depend name="include/haxe/io/Eof.h"/>
</file>
<file name="src/haxe/io/Output.cpp">
<depend name="include/haxe/io/Bytes.h"/>
<depend name="include/haxe/io/Error.h"/>
<depend name="include/haxe/io/Output.h"/>
</file>
<file name="src/haxe/io/Bytes.cpp">
<depend name="include/haxe/io/Bytes.h"/>
<depend name="include/haxe/io/Error.h"/>
</file>
<file name="src/haxe/format/JsonParser.cpp">
<depend name="include/Std.h"/>
<depend name="include/StringBuf.h"/>
<depend name="include/haxe/format/JsonParser.h"/>
</file>
<file name="src/Sys.cpp">
<depend name="include/Sys.h"/>
<depend name="include/cpp/Lib.h"/>
</file>
<file name="src/StringBuf.cpp">
<depend name="include/Std.h"/>
<depend name="include/StringBuf.h"/>
</file>
<file name="src/Std.cpp">
<depend name="include/Std.h"/>
</file>
<file name="src/PathInfo.cpp">
<depend name="include/PathInfo.h"/>
<depend name="include/Sys.h"/>
<depend name="include/haxe/io/Path.h"/>
</file>
<file name="src/Main.cpp">
<depend name="include/Main.h"/>
<depend name="include/PathInfo.h"/>
<depend name="include/Sys.h"/>
<depend name="include/haxe/format/JsonParser.h"/>
<depend name="include/haxe/io/Path.h"/>
<depend name="include/sys/FileSystem.h"/>
<depend name="include/sys/io/File.h"/>
</file>
<file name="src/EReg.cpp">
<depend name="include/EReg.h"/>
<depend name="include/Std.h"/>
<depend name="include/StringBuf.h"/>
<depend name="include/cpp/Lib.h"/>
</file>
<file name="src/cpp/Lib.cpp">
<depend name="include/cpp/Lib.h"/>
</file>
<file name="src/__boot__.cpp">
</file>
<file name="src/__files__.cpp">
</file>
<file name="src/__resources__.cpp">
</file>
</files>
<files id="__lib__">
<compilerflag value="-Iinclude"/>
<file name="src/__lib__.cpp">
<depend name="include/Main.h"/>
</file>
</files>
<files id="__main__">
<compilerflag value="-Iinclude"/>
<file name="src/__main__.cpp">
<depend name="include/Main.h"/>
</file>
</files>
<set name="HAXE_OUTPUT" value="Main" />
<include name="${HXCPP}/build-tool/BuildCommon.xml"/>
</xml>
Binary file added MapUpdater/bin/Main.exe
View file
Binary file not shown.
Binary file added MapUpdater/bin/Main.exp
View file
Binary file not shown.
Binary file added MapUpdater/bin/Main.lib
View file
Binary file not shown.
2 changes: 2 additions & 0 deletions MapUpdater/bin/Options.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
-Dhaxe3="1" -Dhaxe_ver="3.103" -Dhxcpp_api_level="311"
C:\HaxeToolkit\haxe\lib\hxcpp/3,1,30/
1 change: 1 addition & 0 deletions MapUpdater/bin/UpdateMapsPaths.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
["include", "include2"]
47 changes: 47 additions & 0 deletions MapUpdater/bin/include/EReg.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
#ifndef INCLUDED_EReg
#define INCLUDED_EReg

#ifndef HXCPP_H
#include <hxcpp.h>
#endif

HX_DECLARE_CLASS0(EReg)


class HXCPP_CLASS_ATTRIBUTES EReg_obj : public hx::Object{
public:
typedef hx::Object super;
typedef EReg_obj OBJ_;
EReg_obj();
Void __construct(::String r,::String opt);

public:
inline void *operator new( size_t inSize, bool inContainer=true)
{ return hx::Object::operator new(inSize,inContainer); }
static hx::ObjectPtr< EReg_obj > __new(::String r,::String opt);
static Dynamic __CreateEmpty();
static Dynamic __Create(hx::DynamicArray inArgs);
//~EReg_obj();

HX_DO_RTTI;
static void __boot();
static void __register();
void __Mark(HX_MARK_PARAMS);
void __Visit(HX_VISIT_PARAMS);
::String __ToString() const { return HX_CSTRING("EReg"); }

Dynamic r;
bool global;
virtual ::String replace( ::String s,::String by);
Dynamic replace_dyn();

static Dynamic regexp_new_options;
static Dynamic &regexp_new_options_dyn() { return regexp_new_options;}
static Dynamic regexp_match;
static Dynamic &regexp_match_dyn() { return regexp_match;}
static Dynamic regexp_matched_pos;
static Dynamic &regexp_matched_pos_dyn() { return regexp_matched_pos;}
};


#endif /* INCLUDED_EReg */
Loading

0 comments on commit 19a915e

Please sign in to comment.