I now have my code slightly better seperated into engine and game code. Still the same project, since I can't be bothered making it that seperate. I want to get some more work done on the editor soon, I intend to make it produce at least 2 files instead of just one. One for the map tile information, and one for the collision / portal information. That way I can make the engine take in the map as an actual file type, and have the game code play with collision and portals, which makes more sense.

I also want to get my audio synthesizer code working properly, particularly after seeing This Thread. The code should work, but it doesn't. I'm screwing up making the sine wave somehow. I'll post when I get home I think. It's bound to be something simple.
At the moment the tone is wrong (I think), and there's a sort of ticking sound in it too. My guess is the way I fill the buffer is screwed.

Anyway, back to work...