ErikH2000
Level: Legendary Smitemaster

Rank Points: 2794
Registered: 02-04-2003
IP: Logged

Just committed a whole lot of bytes to the repository.

The general idea here is that drod1_5.dat gets split into 3 databases:
- drod1_6.dat
- player.dat
- text.dat

To get things working you should "CVS UPDATE" from "Caravel" to get changes from several project directories.

There are known bugs that I'll be putting in the task manager. It was important to me to get this mess checked in before merging became too difficult, so I created a few bugs unfortunately.

If you want to change text used in the game, edit the appropriate .UNI file, then run a command like this:

DRODUTIL import -t z:\\caravel\\texts

It will erase all of the "basic" messages from text.dat and replace them with new messages from the .UNI files. Basic messages are the ones that have MID_* constants assigned to them.

Also you a new MIDs.h file will be generated containing a MESSAGE_ID enumeration. So no more manual synching of the constants.

To generate 1.6 data from scratch, you use commands like this:

DRODUTIL delete
DRODUTIL create
DRODUTIL import z:\\caravel\\dat1.5
DRODUTIL import -t z:\\caravel\\texts

It's important to use a drod1_5.dat from build 13, because the format changed a lot between then and 1.6.

Schik, I will put your mysql code back into drodutil after I get a bit more organized. I took out all of the code that supported post-build 13 v1.5 data because I don't want to keep around code to support this in-between format..

-Erik

____________________________
The Godkiller - Chapter 1 available now on Steam. It's a DROD-like puzzle adventure game.
dev journals | twitch stream | youtube archive (NSFW)

Schik
Level: Legendary Smitemaster

Rank Points: 5381
Registered: 02-04-2003
IP: Logged

--------------------Configuration: DRODUtil - Win32 Debug--------------------
Compiling...
Util1_6.cpp
e:\\schikore\\priv\\caravel\\drodutil\\util1_6.cpp(32) : fatal error C1083: Cannot open include file: 'DbProps1_5.h': No such file or directory
Error executing cl.exe.

DRODUtil.exe - 1 error(s), 0 warning(s)


Is this one not checked in, or am I screwing something up?


____________________________
The greatness of a nation and its moral progress can be judged by the way it treats its animals.
--Mahatma Gandhi

ErikH2000
Level: Legendary Smitemaster

Rank Points: 2794
Registered: 02-04-2003
IP: Logged

Schik wrote:
Is this one not checked in, or am I screwing something up?

I just added it in response to your message. Try again, please.

-Erik

____________________________
The Godkiller - Chapter 1 available now on Steam. It's a DROD-like puzzle adventure game.
dev journals | twitch stream | youtube archive (NSFW)

Schik
Level: Legendary Smitemaster

Rank Points: 5381
Registered: 02-04-2003
IP: Logged

drodutil import e:\\schikore\\priv\\Caravel\\Dat1.5
DRODUtil v1.6
Portions created by Caravel Software are Copyright (C) 1995, 1996,
1997, 2000, 2001, 2002, 2003 Caravel Software. All Rights Reserved.
Contributors: Michael Welsh Duggan, JP Burford, Rik Cookney, John Wm. Wicks,
Mike Rimer, Matt Schikore <-- Hey, that's me

Default path is E:\\schikore\\priv\\Caravel\\Data.
Default version is 1.6.
-------------------------------------------------------------------------------
FAILED--e:\\schikore\\priv\\Caravel\\Dat1.5\\drod1_5.dat not found.

____________________________
The greatness of a nation and its moral progress can be judged by the way it treats its animals.
--Mahatma Gandhi

Schik
Level: Legendary Smitemaster

Rank Points: 5381
Registered: 02-04-2003
IP: Logged

But obviously, if I just put an old drod1_5.dat there, it works fine.

____________________________
The greatness of a nation and its moral progress can be judged by the way it treats its animals.
--Mahatma Gandhi

mrimer
Level: Legendary Smitemaster

Rank Points: 5056
Registered: 02-04-2003
IP: Logged

FAILED--e:\\schikore\\priv\\Caravel\\Dat1.5\\drod1_5.dat not found.

You'll need to check out the Dat1.5 directory. And put drod1_5.dat there. That'll be a quick and dirty solution.

____________________________
Gandalf? Yes... That's what they used to call me.
Gandalf the Grey. That was my name.
I am Gandalf the White.
And I come back to you now at the turn of the tide.

Schik
Level: Legendary Smitemaster

Rank Points: 5381
Registered: 02-04-2003
IP: Logged

ErikH2000 wrote:

DRODUTIL delete
DRODUTIL create
DRODUTIL import z:\\caravel\\dat1.5
DRODUTIL import -t z:\\caravel\\texts

Is this still supposed to work?

I had an hour or so and was going to try to reproduce some reported bugs. Did a clean checkout and compiled. The 1_6.dat file that's checked in caused some weirdness - the first dialog had no text then it quickly crashed. So I made a new dat file with the above steps. Then drod.exe wanted to be recompiled, since MIDs.h had been changed by the import.

But now drod won't recompile. I get lots of these:

-----------------------------------------
CurrentGame.cpp
e:\\schikore\\priv\\caravel\\texts\\mids.h(556) : error C2371: 'MESSAGE_ID' : redefinition; different basic types
e:\\schikore\\priv\\caravel\\backendlib\\messageids.h(40) : see declaration of 'MESSAGE_ID'
-----------------------------------------

If I just *run* drod now, it's fine. But I can't recompile.

____________________________
The greatness of a nation and its moral progress can be judged by the way it treats its animals.
--Mahatma Gandhi

ErikH2000
Level: Legendary Smitemaster

Rank Points: 2794
Registered: 02-04-2003
IP: Logged

Schik wrote:

ErikH2000 wrote:

DRODUTIL delete
DRODUTIL create
DRODUTIL import z:\\caravel\\dat1.5
DRODUTIL import -t z:\\caravel\\texts

Is this still supposed to work?

Yes.

I had an hour or so and was going to try to reproduce some reported bugs. Did a clean checkout and compiled. The 1_6.dat file that's checked in caused some weirdness - the first dialog had no text then it quickly crashed.

We need to check in updated .dats.

So I made a new dat file with the above steps. Then drod.exe wanted to be recompiled, since MIDs.h had been changed by the import.

A sensible action, but...

But now drod won't recompile. I get lots of these:

You are in a catch-22. You need the updated DRODUtil because it will generate a MIDs.h in a new format compatible with recent changes to the project. But you can't rebuild DRODUtil because you don't have a MIDs.h in the new format.

Solution: "cvs update /C MIDs.h" from the Texts directory.

If we had a good set of dat files checked in, I don't you'd have had to futz with this. Sorry about that! If my pat answer doesn't work, let me know.

-Erik

____________________________
The Godkiller - Chapter 1 available now on Steam. It's a DROD-like puzzle adventure game.
dev journals | twitch stream | youtube archive (NSFW)

Schik
Level: Legendary Smitemaster

Rank Points: 5381
Registered: 02-04-2003
IP: Logged

Now why didn't I think of that.

Okay, it compiles now. Sorry.
And by the way... AAAAAHHH! My cheat mode is gone!!

____________________________
The greatness of a nation and its moral progress can be judged by the way it treats its animals.
--Mahatma Gandhi

ErikH2000
Level: Legendary Smitemaster

Rank Points: 2794
Registered: 02-04-2003
IP: Logged

Schik wrote:
Now why didn't I think of that.

Okay, it compiles now. Sorry.

No problem. When everything suddenly stops building, its reasonable to ask about it before solving the problem the hard way.

And by the way... AAAAAHHH! My cheat mode is gone!!

Heh. That's for the beta builds. Keyword search for "#define ENABLE_CHEAT".

-Erik

____________________________
The Godkiller - Chapter 1 available now on Steam. It's a DROD-like puzzle adventure game.
dev journals | twitch stream | youtube archive (NSFW)

mrimer
Level: Legendary Smitemaster

Rank Points: 5056
Registered: 02-04-2003
IP: Logged

I just fixed the elusive crash-sometimes-when-changing-screen-modes bug (it was hideous!) and polished up some of my code a bit, but SF seems to be down for the night or something so I'll probably check in my stuff tomorrow. That's about everything I can do that's left to do.

I'm excited for this new release to come out! (I don't mind saying it again!)

____________________________
Gandalf? Yes... That's what they used to call me.
Gandalf the Grey. That was my name.
I am Gandalf the White.
And I come back to you now at the turn of the tide.