Print

Please login or register.
1 Hour 1 Day 1 Week 1 Month Forever
Login with username, password and session length

[peterix]

DFHack works for both Linux and Windows and I'm thinking about adding OSX support. The suggestion here clearly isn't feasible, but you could add terrain import from DF - use DFHack in the way it's meant to be used

I'm *slowly* working on that interface. The basics are in place - DFHack can talk directly to DF through shared memory. It's currently only used to accelerate the memory reads/writes and as workaround for some Linux kernel/Xorg bugs, but could be extended as needed. The plan is to move the hacking part to DF's side, so the client apps won't have to deal with this stuff.

[soundandfury]

DFHack works for both Linux and Windows and I'm thinking about adding OSX support. The suggestion here clearly isn't feasible, but you could add terrain import from DF - use DFHack in the way it's meant to be used

I would totally be willing to merge a patch to do that, but I don't want to learn the DFHack API if it's liable to change; since you already know the API, you could code that up, hm?  (DF Designer's code isn't /too/ hard to work with; you could start from a copypasta of the load code or even just make a separate program that dumps a .dfd file from DFHack).

So: "show me the code".

[arghy]

heh just wondering--is this for designing a fortress layout or will it allow me to quickly make forts ingame? I always wanted to make advanced fortress designs without the inconsistencies of hand work so i figured thats what this was haha but its confusing.

[soundandfury]

heh just wondering--is this for designing a fortress layout or will it allow me to quickly make forts ingame? I always wanted to make advanced fortress designs without the inconsistencies of hand work so i figured thats what this was haha but its confusing.

Just designing.  No way to inject it into DF.  (Though I'm sure someone with DFHack skillz could contrib a patch...?)

[CobaltKobold]

heh just wondering--is this for designing a fortress layout or will it allow me to quickly make forts ingame? I always wanted to make advanced fortress designs without the inconsistencies of hand work so i figured thats what this was haha but its confusing.

That's quickfort.

[LegoLord]

But there is an option to export the designs you do in this program as a quickfort compatible CSV file.

[soundandfury]

But there is an option to export the designs you do in this program as a quickfort compatible CSV file.

Although it's very hacky and buggy and will only work if you carefully design the fort in such a way as to make it work.  Or hand-hack the generated CSV.

[dyze]

coming along nicely!
another suggestion, the "copy from z-level above/below" feature, wouldnt it be more handy to do it in a manner more like "clone current layer up/down"?
so then it would clone the current layer, and then change to the cloned z-level, in one click.

[HebaruSan]

Compiles out of the box on my Snow Leopard box (let me know if you want an OSX binary). But the call to SDL_LockSurface without an SDL_UnlockSurface prevents most of the graphics from displaying. Here's a patch to fix that, enable hardware acceleration and double buffering, and clean up the compilation warnings.

Spoiler (click to show/hide)

diff -Nru -x mkfile dfdesigner_0.12/Makefile dfdesigner_0.12a/Makefile
--- dfdesigner_0.12/Makefile   2010-02-07 10:29:03.000000000 -0600
+++ dfdesigner_0.12a/Makefile   2010-05-04 22:13:21.000000000 -0500
@@ -1,6 +1,6 @@
 CC ?= gcc
-CFLAGS ?= -Wall
-SDL = `sdl-config --cflags --libs` -lSDL_image -lSDL_ttf
+CFLAGS := -Wall `sdl-config --cflags`
+LIBS := `sdl-config --libs` -lSDL_image -lSDL_ttf
 BINDIR = bin/
 SRCDIR = src/
 INCDIR = inc/
@@ -10,19 +10,22 @@
 DGFX = -DOSIZ_X=800 -DOSIZ_Y=640 -DOBPP=32
 DFONT = -DFONT_FILE=\"$(FNTDIR)Vera.ttf\"
 
-all: $(BINDIR)designer
+all: designer
 
+clean:
+   rm designer $(BINDIR)designer $(LIBDIR)draw.o $(LIBDIR)dialogs.o
+   
 designer: $(BINDIR)designer
-   -ln $(BINDIR)designer designer --symbolic
+   -ln -s $(BINDIR)designer designer
 
 $(BINDIR)designer: $(SRCDIR)designer.c $(LIBDIR)draw.o $(INCDIR)draw.h $(LIBDIR)dialogs.o $(INCDIR)dialogs.h $(INCDIR)437.h
-   $(CC) $(CFLAGS) $(SDL) -o $(BINDIR)designer $(SRCDIR)designer.c $(LIBDIR)draw.o $(LIBDIR)dialogs.o -lm $(DGFX) $(DFONT)
+   $(CC) $(CFLAGS) -o $(BINDIR)designer $(SRCDIR)designer.c $(LIBDIR)draw.o $(LIBDIR)dialogs.o -lm $(DGFX) $(DFONT) $(LIBS)
 
 $(LIBDIR)draw.o: $(SRCDIR)draw.c $(INCDIR)draw.h
-   $(CC) $(CFLAGS) $(SDL) -o $(LIBDIR)draw.o -c $(SRCDIR)draw.c $(DGFX)
+   $(CC) $(CFLAGS) -o $(LIBDIR)draw.o -c $(SRCDIR)draw.c $(DGFX)
 
 $(LIBDIR)dialogs.o: $(SRCDIR)dialogs.c $(INCDIR)dialogs.h
-   $(CC) $(CFLAGS) $(SDL) -o $(LIBDIR)dialogs.o -c $(SRCDIR)dialogs.c
+   $(CC) $(CFLAGS) -o $(LIBDIR)dialogs.o -c $(SRCDIR)dialogs.c
 
 dist: all
    mkdir dfdesigner_$(VERSION)
diff -Nru -x mkfile dfdesigner_0.12/src/draw.c dfdesigner_0.12a/src/draw.c
--- dfdesigner_0.12/src/draw.c   2010-02-07 10:29:03.000000000 -0600
+++ dfdesigner_0.12a/src/draw.c   2010-05-04 22:19:55.000000000 -0500
@@ -1,25 +1,29 @@
 #include "../inc/draw.h"
 
+#include <stdlib.h> /* atexit */
+
 SDL_Surface * gf_init(int x, int y)
 {
    SDL_Surface * screen;
-   if(SDL_Init(SDL_INIT_VIDEO)<0)
+   if(SDL_Init(SDL_INIT_VIDEO | SDL_DOUBLEBUF)<0)
    {
       perror("SDL_Init");
       return(NULL);
    }
    atexit(SDL_Quit);
-   if((screen = SDL_SetVideoMode(x, y, OBPP, SDL_HWSURFACE))==0)
+   if((screen = SDL_SetVideoMode(x, y, OBPP, SDL_HWSURFACE | SDL_ASYNCBLIT | SDL_HWACCEL))==0)
    {
       perror("SDL_SetVideoMode");
       SDL_Quit();
       return(NULL);
    }
+   /* (LockSurface is supposed to be temporary)
    if(SDL_MUSTLOCK(screen) && SDL_LockSurface(screen) < 0)
    {
       perror("SDL_LockSurface");
       return(NULL);
    }
+   */
    return(screen);
 }

[soundandfury]

Thanks, HebaruSan!  I had some trouble applying those diffs (patch didn't seem to like them, dunno why), but managed to sort it out   Next time I do a new version, I'll do an OSX source tarball version as well.

If you could upload your OSX binaries to DF File Depot, that'd be great.  (Also I'd be grateful if you'd watch this thread, so you can update them when[if] new versions come out.

[HebaruSan]

Thanks, HebaruSan!  I had some trouble applying those diffs (patch didn't seem to like them, dunno why), but managed to sort it out   Next time I do a new version, I'll do an OSX source tarball version as well.

If you could upload your OSX binaries to DF File Depot, that'd be great.  (Also I'd be grateful if you'd watch this thread, so you can update them when[if] new versions come out.

OK! Thread watched, and OSX build uploaded to DFFD: http://dffd.wimbli.com/file.php?id=2312

[soundandfury]

ANN: 0.13 for Linux and 'Doze.
Upgraded the Isometric view mode - it's, technically, no longer isometric, since you can rotate it (in two senses).  So now you can look at your designs from every angle

Aside: it was actually really tricky, because I'm doing all the rendering in software, so I had to pull various tricks to get the draw order right.  In the end, I only handled one quadrant and then rotated the map data to get the other views.  Lots of fun with segfaults, but it works now =)

Hebaru: if you're making an OSX build, you'll have to apply your patches again as the current source remains unpatched.  I can't think of anything I've changed that might call for more patching effort, but then I don't know much about Macs :S

[Daenyth]

Cool stuff! Can you link me to the source repo? I'd be happy to build a package for Arch Linux and put it in the arch-games repo

[soundandfury]

Cool stuff! Can you link me to the source repo? I'd be happy to build a package for Arch Linux and put it in the arch-games repo

The source is in the main download (on DFFD).  Also, thanks; I know packaging is a dull job.

[Daenyth]

Ah, ok. You really should be using some kind of version control for programming. You don't even know how much you want it yet

PM me and I can help you get set up on github if you like. I'll make a note to build this for now too.

Edit: track it here: http://archlinux-gaming.org/issues/147